From a06d213808ffa536efa643a91f127f8fe4da5ac5 Mon Sep 17 00:00:00 2001
From: Alexandre Bourdiol <alexandre.bourdiol@st.com>
Date: Mon, 3 May 2021 17:56:02 +0200
Subject: [PATCH] boards: black_f407zg_pro: Use dts for clocks configuration

Convert board to use of device tree for clocks configuration.

Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
---
 .../arm/black_f407zg_pro/black_f407zg_pro.dts | 22 +++++++++++++++++++
 .../black_f407zg_pro_defconfig                | 18 +--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/boards/arm/black_f407zg_pro/black_f407zg_pro.dts b/boards/arm/black_f407zg_pro/black_f407zg_pro.dts
index f6eb0f2f14d..bd5d7b1b865 100644
--- a/boards/arm/black_f407zg_pro/black_f407zg_pro.dts
+++ b/boards/arm/black_f407zg_pro/black_f407zg_pro.dts
@@ -56,6 +56,28 @@
 	};
 };
 
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(8)>;
+	status = "okay";
+};
+
+&pll {
+	div-m = <8>;
+	mul-n = <336>;
+	div-p = <2>;
+	div-q = <7>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(168)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <4>;
+	apb2-prescaler = <2>;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pb7>;
 	current-speed = <115200>;
diff --git a/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig b/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig
index 50b5d1e3dca..24ba17ec41c 100644
--- a/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig
+++ b/boards/arm/black_f407zg_pro/black_f407zg_pro_defconfig
@@ -2,8 +2,6 @@
 
 CONFIG_SOC_SERIES_STM32F4X=y
 CONFIG_SOC_STM32F407XG=y
-# 168MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
 
 # Enable MPU
 CONFIG_ARM_MPU=y
@@ -21,22 +19,8 @@ CONFIG_UART_CONSOLE=y
 # Enable pinmux
 CONFIG_PINMUX=y
 
-# Clock configuration
+# Enable Clocks
 CONFIG_CLOCK_CONTROL=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Clock configuration for Cube Clock control driver
-CONFIG_CLOCK_STM32_HSE_CLOCK=8000000
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-# Use HSE as PLL input
-CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
-# Produce 168MHz clock at PLL output
-CONFIG_CLOCK_STM32_PLL_M_DIVISOR=8
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=336
-CONFIG_CLOCK_STM32_PLL_P_DIVISOR=2
-CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=7
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=4
-CONFIG_CLOCK_STM32_APB2_PRESCALER=2