michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/clock_control: stm32u5: Factorize bus prescalers settings

Browse source 
Move prescaler settings to the clock_control_init function.
At this step they will be set up twice in PLL case, this will
be fixed in a next step.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2022-03-04 10:05:59 +01:00 • committed by Carles Cufí
commit 41ecdb9d14
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/clock_control/clock_stm32_ll_u5.c
View file

@ -244,7 +244,6 @@ static void clock_switch_to_hsi(uint32_t ahb_prescaler)
/* Set HSI as SYSCLCK source */ /* Set HSI as SYSCLCK source */
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI);
LL_RCC_SetAHBPrescaler(ahb_prescaler);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) { while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) {
} }
} }
@ -389,15 +388,9 @@ void config_src_sysclk_hse(LL_UTILS_ClkInitTypeDef s_ClkInitStruct)
/* 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(s_ClkInitStruct.AHBCLKDivider);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSE) { while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSE) {
} }
/* Set peripheral busses prescalers */
LL_RCC_SetAPB1Prescaler(s_ClkInitStruct.APB1CLKDivider);
LL_RCC_SetAPB2Prescaler(s_ClkInitStruct.APB2CLKDivider);
LL_RCC_SetAPB3Prescaler(s_ClkInitStruct.APB3CLKDivider);
/* If freq not increased, set flash latency after all clock setting */ /* If freq not increased, set flash latency after all clock setting */
if (new_hclk_freq <= old_hclk_freq) { if (new_hclk_freq <= old_hclk_freq) {
LL_SetFlashLatency(new_hclk_freq); LL_SetFlashLatency(new_hclk_freq);
@ -443,15 +436,9 @@ void config_src_sysclk_msis(LL_UTILS_ClkInitTypeDef s_ClkInitStruct)
/* Set MSIS as SYSCLCK source */ /* Set MSIS as SYSCLCK source */
set_up_clk_msis(); set_up_clk_msis();
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSIS); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSIS);
LL_RCC_SetAHBPrescaler(s_ClkInitStruct.AHBCLKDivider);
while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSIS) { while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSIS) {
} }
/* Set peripheral busses prescalers */
LL_RCC_SetAPB1Prescaler(s_ClkInitStruct.APB1CLKDivider);
LL_RCC_SetAPB2Prescaler(s_ClkInitStruct.APB2CLKDivider);
LL_RCC_SetAPB3Prescaler(s_ClkInitStruct.APB3CLKDivider);
/* If freq not increased, set flash latency after all clock setting */ /* If freq not increased, set flash latency after all clock setting */
if (new_hclk_freq <= old_hclk_freq) { if (new_hclk_freq <= old_hclk_freq) {
LL_SetFlashLatency(new_hclk_freq); LL_SetFlashLatency(new_hclk_freq);
@ -474,11 +461,6 @@ void config_src_sysclk_hsi(LL_UTILS_ClkInitTypeDef s_ClkInitStruct)
clock_switch_to_hsi(s_ClkInitStruct.AHBCLKDivider); clock_switch_to_hsi(s_ClkInitStruct.AHBCLKDivider);
/* Set peripheral busses prescalers */
LL_RCC_SetAPB1Prescaler(s_ClkInitStruct.APB1CLKDivider);
LL_RCC_SetAPB2Prescaler(s_ClkInitStruct.APB2CLKDivider);
LL_RCC_SetAPB3Prescaler(s_ClkInitStruct.APB3CLKDivider);
/* Set flash latency */ /* Set flash latency */
/* HSI used as SYSCLK, set latency to 0 */ /* HSI used as SYSCLK, set latency to 0 */
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0); LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
@ -503,6 +485,12 @@ int stm32_clock_control_init(const struct device *dev)
/* Some clocks would be activated by default */ /* Some clocks would be activated by default */
config_enable_default_clocks(); config_enable_default_clocks();
/* Set peripheral busses prescalers */
LL_RCC_SetAHBPrescaler(ahb_prescaler(STM32_AHB_PRESCALER));
LL_RCC_SetAPB1Prescaler(apb1_prescaler(STM32_APB1_PRESCALER));
LL_RCC_SetAPB2Prescaler(apb2_prescaler(STM32_APB2_PRESCALER));
LL_RCC_SetAPB3Prescaler(apb3_prescaler(STM32_APB3_PRESCALER));
if (IS_ENABLED(STM32_SYSCLK_SRC_PLL)) { if (IS_ENABLED(STM32_SYSCLK_SRC_PLL)) {
/* Configure PLL as source of SYSCLK */ /* Configure PLL as source of SYSCLK */
config_src_sysclk_pll(s_ClkInitStruct); config_src_sysclk_pll(s_ClkInitStruct);