michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb: stm32f1: USB clk prescaler config done in clock_controller

Browse source 
Now that USB clock prescaler is done is clock_control driver.
Remove similar part in USB driver.

Note that behavior is different: it is now up to the user to provide
the proper configuration.
Add a warning during the transition period.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2022-12-21 13:36:52 +01:00 • committed by Carles Cufí
commit 56d93e3fef
1 changed files with 8 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

55
drivers/usb/device/usb_dc_stm32.c
View file

@ -277,53 +277,14 @@ static int usb_dc_stm32_clock_enable(void)
} }
#endif /* STM32_MSI_PLL_MODE && !STM32_SYSCLK_SRC_MSI */ #endif /* STM32_MSI_PLL_MODE && !STM32_SYSCLK_SRC_MSI */
#elif defined(RCC_CFGR_OTGFSPRE) #elif defined(RCC_CFGR_OTGFSPRE) || defined(RCC_CFGR_USBPRE)
/* On STM32F105 and STM32F107 parts the USB OTGFSCLK is derived from
* PLL1, and must result in a 48 MHz clock... the options to achieve #if (MHZ(48) == CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC) && !defined(STM32_PLL_USBPRE)
* this are as below, controlled by the RCC_CFGR_OTGFSPRE bit. /* PLL output clock is set to 48MHz, it should not be divided */
* - PLLCLK * 2 / 2 i.e: PLLCLK == 48 MHz #warning USBPRE/OTGFSPRE should be set in rcc node
* - PLLCLK * 2 / 3 i.e: PLLCLK == 72 MHz #endif
*
* this requires that the system is running from PLLCLK #endif /* RCC_HSI48_SUPPORT / LL_RCC_USB_CLKSOURCE_NONE */
*/
if (LL_RCC_GetSysClkSource() == LL_RCC_SYS_CLKSOURCE_STATUS_PLL) {
switch (sys_clock_hw_cycles_per_sec()) {
case MHZ(48):
LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL_DIV_2);
break;
case MHZ(72):
LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL_DIV_3);
break;
default:
LOG_ERR("Unable to set USB clock source (incompatible PLLCLK rate)");
return -EIO;
}
} else {
LOG_ERR("Unable to set USB clock source (not using PLL1)");
return -EIO;
}
#elif defined(RCC_CFGR_USBPRE)
/* on other STM32F1 family SOCs, we have a simple /1 or /1.5 divider on
* the back of the RCC. Similar strategy to the above, but we use the
* correct flags
*/
if (LL_RCC_GetSysClkSource() == LL_RCC_SYS_CLKSOURCE_STATUS_PLL) {
switch (sys_clock_hw_cycles_per_sec()) {
case MHZ(48):
LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL);
break;
case MHZ(72):
LL_RCC_SetUSBClockSource(LL_RCC_USB_CLKSOURCE_PLL_DIV_1_5);
break;
default:
LOG_ERR("Unable to set USB clock source (incompatible PLLCLK rate)");
return -EIO;
}
} else {
LOG_ERR("Unable to set USB clock source (not using PLL1)");
return -EIO;
}
#endif /* RCC_HSI48_SUPPORT / LL_RCC_USB_CLKSOURCE_NONE / RCC_CFGR_OTGFSPRE / RCC_CFGR_USBPRE */
if (!device_is_ready(clk)) { if (!device_is_ready(clk)) {
LOG_ERR("clock control device not ready"); LOG_ERR("clock control device not ready");