michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/clock_control: stm32 common: Use DT macros for bus prescalers

Browse source 
Simplify and clean up driver code using STM32 clocks DT based macros.

Added STM32_FLASH_PRESCALER macro for this purpose.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2022-03-23 09:58:54 +01:00 • committed by Carles Cufí
commit f6db7afb60
2 changed files with 31 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

65
drivers/clock_control/clock_stm32_ll_common.c
View file

@ -24,10 +24,10 @@
#define fn_apb1_prescaler(v) LL_RCC_APB1_DIV_ ## v #define fn_apb1_prescaler(v) LL_RCC_APB1_DIV_ ## v
#define apb1_prescaler(v) fn_apb1_prescaler(v) #define apb1_prescaler(v) fn_apb1_prescaler(v)
#ifndef CONFIG_SOC_SERIES_STM32F0X #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), apb2_prescaler)
#define fn_apb2_prescaler(v) LL_RCC_APB2_DIV_ ## v #define fn_apb2_prescaler(v) LL_RCC_APB2_DIV_ ## v
#define apb2_prescaler(v) fn_apb2_prescaler(v) #define apb2_prescaler(v) fn_apb2_prescaler(v)
#endif /* CONFIG_SOC_SERIES_STM32F0X */ #endif
#define fn_mco1_prescaler(v) LL_RCC_MCO1_DIV_ ## v #define fn_mco1_prescaler(v) LL_RCC_MCO1_DIV_ ## v
#define mco1_prescaler(v) fn_mco1_prescaler(v) #define mco1_prescaler(v) fn_mco1_prescaler(v)
@ -45,14 +45,10 @@
LL_RCC_MSIRANGESEL_RUN, LL_RCC_MSI_GetRange()) LL_RCC_MSIRANGESEL_RUN, LL_RCC_MSI_GetRange())
#endif #endif
#if defined(CONFIG_SOC_SERIES_STM32WBX) || defined(CONFIG_SOC_SERIES_STM32WLX) #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb4_prescaler)
#define __LL_RCC_CALC_HCLK_FREQ __LL_RCC_CALC_HCLK1_FREQ
#endif
#if defined(CONFIG_SOC_SERIES_STM32WBX)
#define RCC_CALC_FLASH_FREQ __LL_RCC_CALC_HCLK4_FREQ #define RCC_CALC_FLASH_FREQ __LL_RCC_CALC_HCLK4_FREQ
#define GET_CURRENT_FLASH_PRESCALER LL_RCC_GetAHB4Prescaler #define GET_CURRENT_FLASH_PRESCALER LL_RCC_GetAHB4Prescaler
#elif defined(CONFIG_SOC_SERIES_STM32WLX) #elif DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb3_prescaler)
#define RCC_CALC_FLASH_FREQ __LL_RCC_CALC_HCLK3_FREQ #define RCC_CALC_FLASH_FREQ __LL_RCC_CALC_HCLK3_FREQ
#define GET_CURRENT_FLASH_PRESCALER LL_RCC_GetAHB3Prescaler #define GET_CURRENT_FLASH_PRESCALER LL_RCC_GetAHB3Prescaler
#else #else
@ -253,11 +249,10 @@ static int stm32_clock_control_get_subsys_rate(const struct device *clock,
*/ */
uint32_t ahb_clock = SystemCoreClock; uint32_t ahb_clock = SystemCoreClock;
uint32_t apb1_clock = get_bus_clock(ahb_clock, STM32_APB1_PRESCALER); uint32_t apb1_clock = get_bus_clock(ahb_clock, STM32_APB1_PRESCALER);
#if !defined (CONFIG_SOC_SERIES_STM32F0X) && \ #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), apb2_prescaler)
!defined (CONFIG_SOC_SERIES_STM32G0X)
uint32_t apb2_clock = get_bus_clock(ahb_clock, STM32_APB2_PRESCALER); uint32_t apb2_clock = get_bus_clock(ahb_clock, STM32_APB2_PRESCALER);
#endif #endif
#if defined(CONFIG_SOC_SERIES_STM32WLX) #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb3_prescaler)
uint32_t ahb3_clock = get_bus_clock(ahb_clock * STM32_CPU1_PRESCALER, uint32_t ahb3_clock = get_bus_clock(ahb_clock * STM32_CPU1_PRESCALER,
STM32_AHB3_PRESCALER); STM32_AHB3_PRESCALER);
#endif #endif
@ -375,8 +370,6 @@ static inline void stm32_clock_control_mco_init(void)
int stm32_clock_control_init(const struct device *dev) int stm32_clock_control_init(const struct device *dev)
{ {
LL_UTILS_ClkInitTypeDef s_ClkInitStruct; LL_UTILS_ClkInitTypeDef s_ClkInitStruct;
uint32_t hclk_prescaler;
uint32_t flash_prescaler;
uint32_t new_hclk_freq; uint32_t new_hclk_freq;
uint32_t old_flash_freq; uint32_t old_flash_freq;
uint32_t new_flash_freq; uint32_t new_flash_freq;
@ -386,18 +379,6 @@ int stm32_clock_control_init(const struct device *dev)
/* configure clock for AHB/APB buses */ /* configure clock for AHB/APB buses */
config_bus_clk_init((LL_UTILS_ClkInitTypeDef *)&s_ClkInitStruct); config_bus_clk_init((LL_UTILS_ClkInitTypeDef *)&s_ClkInitStruct);
/* update local hclk and flash-clk prescaler variable */
#if defined(CONFIG_SOC_SERIES_STM32WBX)
hclk_prescaler = s_ClkInitStruct.CPU1CLKDivider;
flash_prescaler = s_ClkInitStruct.AHB4CLKDivider;
#elif defined(CONFIG_SOC_SERIES_STM32WLX)
hclk_prescaler = s_ClkInitStruct.CPU1CLKDivider;
flash_prescaler = s_ClkInitStruct.AHB3CLKDivider;
#else
hclk_prescaler = s_ClkInitStruct.AHBCLKDivider;
flash_prescaler = hclk_prescaler;
#endif
/* Some clocks would be activated by default */ /* Some clocks would be activated by default */
config_enable_default_clocks(); config_enable_default_clocks();
@ -407,7 +388,8 @@ int stm32_clock_control_init(const struct device *dev)
new_hclk_freq = get_bus_clock(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, new_hclk_freq = get_bus_clock(CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,
STM32_CORE_PRESCALER); STM32_CORE_PRESCALER);
new_flash_freq = RCC_CALC_FLASH_FREQ(new_hclk_freq, flash_prescaler); new_flash_freq = RCC_CALC_FLASH_FREQ(new_hclk_freq,
STM32_FLASH_PRESCALER);
/* If freq increases, set flash latency before any clock setting */ /* If freq increases, set flash latency before any clock setting */
if (new_flash_freq > old_flash_freq) { if (new_flash_freq > old_flash_freq) {
@ -535,7 +517,7 @@ int stm32_clock_control_init(const struct device *dev)
/* Set HSE as SYSCLCK source */ /* Set HSE as SYSCLCK source */
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSE);
LL_RCC_SetAHBPrescaler(hclk_prescaler); LL_RCC_SetAHBPrescaler(STM32_CORE_PRESCALER);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSE) { while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSE) {
} }
@ -568,13 +550,13 @@ int stm32_clock_control_init(const struct device *dev)
/* Set MSI as SYSCLCK source */ /* Set MSI as SYSCLCK source */
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI);
LL_RCC_SetAHBPrescaler(hclk_prescaler); LL_RCC_SetAHBPrescaler(STM32_CORE_PRESCALER);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) { while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) {
} }
#elif STM32_SYSCLK_SRC_HSI #elif STM32_SYSCLK_SRC_HSI
stm32_clock_switch_to_hsi(hclk_prescaler); stm32_clock_switch_to_hsi(STM32_CORE_PRESCALER);
#endif /* STM32_SYSCLK_SRC_... */ #endif /* STM32_SYSCLK_SRC_... */
@ -585,21 +567,20 @@ int stm32_clock_control_init(const struct device *dev)
SystemCoreClock = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC; SystemCoreClock = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC;
/* Set APB1 & APB2 prescaler*/ /* Set bus prescalers prescaler */
LL_RCC_SetAPB1Prescaler(s_ClkInitStruct.APB1CLKDivider); LL_RCC_SetAPB1Prescaler(apb1_prescaler(STM32_APB1_PRESCALER));
#if !defined (CONFIG_SOC_SERIES_STM32F0X) && \ #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), apb2_prescaler)
!defined (CONFIG_SOC_SERIES_STM32G0X) LL_RCC_SetAPB2Prescaler(apb2_prescaler(STM32_APB2_PRESCALER));
LL_RCC_SetAPB2Prescaler(s_ClkInitStruct.APB2CLKDivider);
#endif #endif
#if defined(CONFIG_SOC_SERIES_STM32WBX) || defined(STM32WL_DUAL_CORE) #if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), cpu2_prescaler)
LL_C2_RCC_SetAHBPrescaler(s_ClkInitStruct.CPU2CLKDivider); LL_C2_RCC_SetAHBPrescaler(ahb_prescaler(STM32_CPU2_PRESCALER));
#endif
#if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb3_prescaler)
LL_RCC_SetAHB3Prescaler(ahb_prescaler(STM32_AHB3_PRESCALER));
#endif
#if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb4_prescaler)
LL_RCC_SetAHB4Prescaler(ahb_prescaler(STM32_AHB4_PRESCALER));
#endif #endif
#ifdef CONFIG_SOC_SERIES_STM32WBX
LL_RCC_SetAHB4Prescaler(s_ClkInitStruct.AHB4CLKDivider);
#endif /* CONFIG_SOC_SERIES_STM32WBX */
#ifdef CONFIG_SOC_SERIES_STM32WLX
LL_RCC_SetAHB3Prescaler(s_ClkInitStruct.AHB3CLKDivider);
#endif /* CONFIG_SOC_SERIES_STM32WLX */
/* configure MCO1/MCO2 based on Kconfig */ /* configure MCO1/MCO2 based on Kconfig */
stm32_clock_control_mco_init(); stm32_clock_control_mco_init();

8
include/zephyr/drivers/clock_control/stm32_clock_control.h
View file

@ -39,6 +39,14 @@
#define STM32_CORE_PRESCALER STM32_CPU1_PRESCALER #define STM32_CORE_PRESCALER STM32_CPU1_PRESCALER
#endif #endif
#if DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb3_prescaler)
#define STM32_FLASH_PRESCALER STM32_AHB3_PRESCALER
#elif DT_NODE_HAS_PROP(DT_NODELABEL(rcc), ahb4_prescaler)
#define STM32_FLASH_PRESCALER STM32_AHB4_PRESCALER
#else
#define STM32_FLASH_PRESCALER STM32_CORE_PRESCALER
#endif
#define STM32_D1CPRE DT_PROP(DT_NODELABEL(rcc), d1cpre) #define STM32_D1CPRE DT_PROP(DT_NODELABEL(rcc), d1cpre)
#define STM32_HPRE DT_PROP(DT_NODELABEL(rcc), hpre) #define STM32_HPRE DT_PROP(DT_NODELABEL(rcc), hpre)
#define STM32_D2PPRE1 DT_PROP(DT_NODELABEL(rcc), d2ppre1) #define STM32_D2PPRE1 DT_PROP(DT_NODELABEL(rcc), d2ppre1)