From a8da0b97a67911c1396c79da9ff7f02342cc1b60 Mon Sep 17 00:00:00 2001
From: Alexandre Bourdiol <alexandre.bourdiol@st.com>
Date: Fri, 30 Apr 2021 10:25:04 +0200
Subject: [PATCH] boards: stm32l496g_disco: 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/stm32l496g_disco/stm32l496g_disco.dts | 22 +++++++++++++++++++
 .../stm32l496g_disco_defconfig                | 17 +-------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco.dts b/boards/arm/stm32l496g_disco/stm32l496g_disco.dts
index e45c1207ae2..7020a005f83 100644
--- a/boards/arm/stm32l496g_disco/stm32l496g_disco.dts
+++ b/boards/arm/stm32l496g_disco/stm32l496g_disco.dts
@@ -63,6 +63,28 @@
 
 };
 
+&clk_hsi {
+	status = "okay";
+};
+
+&pll {
+	div-m = <1>;
+	mul-n = <20>;
+	div-p = <7>;
+	div-q = <2>;
+	div-r = <4>;
+	clocks = <&clk_hsi>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(80)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <1>;
+	apb2-prescaler = <1>;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pb6 &usart1_rx_pg10>;
 	current-speed = <115200>;
diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig
index 3956f0d2137..be068397cfb 100644
--- a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig
+++ b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig
@@ -2,8 +2,6 @@
 
 CONFIG_SOC_SERIES_STM32L4X=y
 CONFIG_SOC_STM32L496XX=y
-# 80MHz system clock
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000
 
 # Enable MPU
 CONFIG_ARM_MPU=y
@@ -20,21 +18,8 @@ CONFIG_PINMUX=y
 # enable GPIOs
 CONFIG_GPIO=y
 
-# clock configuration
+# Enable Clocks
 CONFIG_CLOCK_CONTROL=y
-# SYSCLK selection
-CONFIG_CLOCK_STM32_SYSCLK_SRC_PLL=y
-# PLL configuration
-CONFIG_CLOCK_STM32_PLL_SRC_HSI=y
-# produce 80MHz clock at PLL output
-CONFIG_CLOCK_STM32_PLL_M_DIVISOR=1
-CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=20
-CONFIG_CLOCK_STM32_PLL_P_DIVISOR=7
-CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=2
-CONFIG_CLOCK_STM32_PLL_R_DIVISOR=4
-CONFIG_CLOCK_STM32_AHB_PRESCALER=1
-CONFIG_CLOCK_STM32_APB1_PRESCALER=1
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1
 
 # console
 CONFIG_CONSOLE=y