diff --git a/src/cmsis/src/st/system_stm32fxxx.c b/src/cmsis/src/st/system_stm32fxxx.c index 540fc46d5..0abb007ad 100644 --- a/src/cmsis/src/st/system_stm32fxxx.c +++ b/src/cmsis/src/st/system_stm32fxxx.c @@ -278,13 +278,13 @@ void SystemClock_Config(void) |RCC_PERIPHCLK_ADC|RCC_PERIPHCLK_USB |RCC_PERIPHCLK_QSPI|RCC_PERIPHCLK_FMC |RCC_PERIPHCLK_RNG; - PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLL; + PeriphClkInitStruct.UsbClockSelection = OMV_OSC_USB_CLKSOURCE; PeriphClkInitStruct.SdmmcClockSelection = RCC_SDMMCCLKSOURCE_PLL; PeriphClkInitStruct.FdcanClockSelection = RCC_FDCANCLKSOURCE_PLL; PeriphClkInitStruct.FmcClockSelection = RCC_FMCCLKSOURCE_PLL2; PeriphClkInitStruct.QspiClockSelection = RCC_QSPICLKSOURCE_PLL2; - PeriphClkInitStruct.AdcClockSelection = OMV_OSC_ADC_SOURCE; - PeriphClkInitStruct.Spi123ClockSelection = OMV_OSC_SPI123_SOURCE; + PeriphClkInitStruct.AdcClockSelection = OMV_OSC_ADC_CLKSOURCE; + PeriphClkInitStruct.Spi123ClockSelection = OMV_OSC_SPI123_CLKSOURCE; PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; PeriphClkInitStruct.I2c123ClockSelection = RCC_I2C123CLKSOURCE_D2PCLK1; PeriphClkInitStruct.Spi45ClockSelection = RCC_SPI45CLKSOURCE_PLL2; diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.h b/src/omv/boards/OPENMV4/omv_boardconfig.h index ef7419799..52454ef6b 100644 --- a/src/omv/boards/OPENMV4/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4/omv_boardconfig.h @@ -106,8 +106,9 @@ #define OMV_OSC_PLL3FRAC (0) // Clock Sources -#define OMV_OSC_ADC_SOURCE RCC_ADCCLKSOURCE_PLL3 -#define OMV_OSC_SPI123_SOURCE RCC_SPI123CLKSOURCE_PLL3 +#define OMV_OSC_USB_CLKSOURCE RCC_USBCLKSOURCE_PLL +#define OMV_OSC_ADC_CLKSOURCE RCC_ADCCLKSOURCE_PLL3 +#define OMV_OSC_SPI123_CLKSOURCE RCC_SPI123CLKSOURCE_PLL3 // HSE/HSI/CSI State #define OMV_OSC_HSE_STATE (RCC_HSE_ON) diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.h b/src/omv/boards/OPENMV4P/omv_boardconfig.h index 459a6ee2d..45ae3761f 100644 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.h +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.h @@ -110,8 +110,9 @@ #define OMV_OSC_PLL3FRAC (0) // Clock Sources -#define OMV_OSC_ADC_SOURCE RCC_ADCCLKSOURCE_PLL3 -#define OMV_OSC_SPI123_SOURCE RCC_SPI123CLKSOURCE_PLL3 +#define OMV_OSC_USB_CLKSOURCE RCC_USBCLKSOURCE_PLL +#define OMV_OSC_ADC_CLKSOURCE RCC_ADCCLKSOURCE_PLL3 +#define OMV_OSC_SPI123_CLKSOURCE RCC_SPI123CLKSOURCE_PLL3 // HSE/HSI/CSI State #define OMV_OSC_HSE_STATE (RCC_HSE_ON) diff --git a/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h b/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h index a02d8847f..6a6cc31f0 100644 --- a/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h +++ b/src/omv/boards/OPENMVPURETHERMAL/omv_boardconfig.h @@ -80,8 +80,9 @@ #define OMV_CORE_VBAT "3.3" // Clock Sources -#define OMV_OSC_ADC_SOURCE RCC_ADCCLKSOURCE_PLL2 -#define OMV_OSC_SPI123_SOURCE RCC_SPI123CLKSOURCE_PLL2 +#define OMV_OSC_USB_CLKSOURCE RCC_USBCLKSOURCE_PLL +#define OMV_OSC_ADC_CLKSOURCE RCC_ADCCLKSOURCE_PLL2 +#define OMV_OSC_SPI123_CLKSOURCE RCC_SPI123CLKSOURCE_PLL2 //PLL1 48MHz for USB, SDMMC and FDCAN #define OMV_OSC_PLL1M (3) diff --git a/src/omv/boards/PORTENTA/omv_boardconfig.h b/src/omv/boards/PORTENTA/omv_boardconfig.h index 2f3fa9878..2c78bede3 100644 --- a/src/omv/boards/PORTENTA/omv_boardconfig.h +++ b/src/omv/boards/PORTENTA/omv_boardconfig.h @@ -107,8 +107,9 @@ #define OMV_OSC_PLL3FRAC (0) // Clock Sources -#define OMV_OSC_ADC_SOURCE RCC_ADCCLKSOURCE_PLL3 -#define OMV_OSC_SPI123_SOURCE RCC_SPI123CLKSOURCE_PLL3 +#define OMV_OSC_USB_CLKSOURCE RCC_USBCLKSOURCE_HSI48 +#define OMV_OSC_ADC_CLSOURCE RCC_ADCCLKSOURCE_PLL3 +#define OMV_OSC_SPI123_CLKSOURCE RCC_SPI123CLKSOURCE_PLL3 // HSE/HSI/CSI State #define OMV_OSC_HSE_STATE (RCC_HSE_BYPASS)