From fe9cfb2ffdef06d96a2eb56bbbd3659fe11adaa4 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Tue, 4 May 2021 10:32:00 +0200 Subject: [PATCH] boards: waveshare_open103z: Use dts for clocks configuration Convert board to use of device tree for clocks configuration. Signed-off-by: Erwan Gouriou --- .../waveshare_open103z/waveshare_open103z.dts | 19 +++++++++++++++++++ .../waveshare_open103z_defconfig | 14 +------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/boards/arm/waveshare_open103z/waveshare_open103z.dts b/boards/arm/waveshare_open103z/waveshare_open103z.dts index 13fd5db3176..38cb2e3f0f9 100644 --- a/boards/arm/waveshare_open103z/waveshare_open103z.dts +++ b/boards/arm/waveshare_open103z/waveshare_open103z.dts @@ -77,6 +77,25 @@ }; }; +&clk_hse { + clock-frequency = ; + status = "okay"; +}; + +&pll { + mul = <9>; + clocks = <&clk_hse>; + status = "okay"; +}; + +&rcc { + clocks = <&pll>; + clock-frequency = ; + ahb-prescaler = <1>; + apb1-prescaler = <2>; + apb2-prescaler = <1>; +}; + &usart1 { pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>; current-speed = <115200>; diff --git a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig b/boards/arm/waveshare_open103z/waveshare_open103z_defconfig index dd5e6f9ca95..e86eadbf22b 100644 --- a/boards/arm/waveshare_open103z/waveshare_open103z_defconfig +++ b/boards/arm/waveshare_open103z/waveshare_open103z_defconfig @@ -2,8 +2,6 @@ CONFIG_SOC_SERIES_STM32F1X=y CONFIG_SOC_STM32F103XE=y -# 72MHz system clock -CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000 # enable uart driver CONFIG_SERIAL=y @@ -17,15 +15,5 @@ CONFIG_PINMUX=y # enable GPIO CONFIG_GPIO=y -# clock configuration +# enable clocks CONFIG_CLOCK_CONTROL=y -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 72MHz clock at PLL output -CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9 -CONFIG_CLOCK_STM32_AHB_PRESCALER=1 -# APB1 clock must not to exceed 36MHz limit -CONFIG_CLOCK_STM32_APB1_PRESCALER=2 -CONFIG_CLOCK_STM32_APB2_PRESCALER=1