diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco.dts b/boards/arm/stm32l476g_disco/stm32l476g_disco.dts
index f563c658bfc..6f6b311e6e7 100644
--- a/boards/arm/stm32l476g_disco/stm32l476g_disco.dts
+++ b/boards/arm/stm32l476g_disco/stm32l476g_disco.dts
@@ -65,6 +65,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>;
+};
+
 &usart2 {
 	pinctrl-0 = <&usart2_tx_pd5 &usart2_rx_pd6>;
 	current-speed = <115200>;
diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig
index 4642f74bdf1..f1d5b8011ba 100644
--- a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig
+++ b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig
@@ -2,8 +2,6 @@
 
 CONFIG_SOC_SERIES_STM32L4X=y
 CONFIG_SOC_STM32L476XX=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 GPIO
 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