Merge pull request #11525 from jeromecoutant/PR_LSI

STM32WB/STM32H7 : LSI selection when LSE is not available

Author: 0xc0170

targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc.h

@@ -430,6 +430,9 @@ typedef struct
 /** @defgroup RCC_RTC_Clock_Source  RCC RTC Clock Source
   * @{
   */
+/* MBED */
+#define RCC_RTCCLKSOURCE_NO_CLK          (0x00000000U)
+/* MBED */
 #define RCC_RTCCLKSOURCE_LSE             (0x00000100U)
 #define RCC_RTCCLKSOURCE_LSI             (0x00000200U)
 #define RCC_RTCCLKSOURCE_HSE_DIV2        (0x00002300U)

targets/TARGET_STM/TARGET_STM32WB/device/stm32_hal_legacy.h

@@ -2929,9 +2929,8 @@
 #define RCC_MCOSOURCE_PLLCLK_NODIV  RCC_MCO1SOURCE_PLLCLK
 #define RCC_MCOSOURCE_PLLCLK_DIV2   RCC_MCO1SOURCE_PLLCLK_DIV2
 
-#if defined(STM32L4)
+#if defined(STM32L4) || defined(STM32WB)
 #define RCC_RTCCLKSOURCE_NO_CLK     RCC_RTCCLKSOURCE_NONE
-#elif defined(STM32WB) || defined(STM32G0)
 #else
 #define RCC_RTCCLKSOURCE_NONE       RCC_RTCCLKSOURCE_NO_CLK
 #endif

targets/TARGET_STM/lp_ticker.c

@@ -113,7 +113,11 @@ void lp_ticker_init(void)
 #else /* MBED_CONF_TARGET_LSE_AVAILABLE */
 
     /* Enable LSI clock */
+#if TARGET_STM32WB
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1;
+#else
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI;
+#endif
     RCC_OscInitStruct.LSIState = RCC_LSI_ON;
     RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
 

targets/TARGET_STM/mbed_overrides.c

@@ -61,7 +61,11 @@ void mbed_sdk_init()
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
     if (__HAL_RCC_GET_RTC_SOURCE() != RCC_RTCCLKSOURCE_NO_CLK) {
+#if TARGET_STM32WB
+        RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1;
+#else
         RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI;
+#endif
         RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_NONE;
         RCC_OscInitStruct.LSIState       = RCC_LSI_ON;
         if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {

targets/TARGET_STM/rtc_api.c

@@ -74,7 +74,11 @@ void rtc_init(void)
         error("PeriphClkInitStruct RTC failed with LSE\n");
     }
 #else /*  MBED_CONF_TARGET_LSE_AVAILABLE */
+#if TARGET_STM32WB
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1;
+#else
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI;
+#endif
     RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_NONE;
     RCC_OscInitStruct.LSIState       = RCC_LSI_ON;
     if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {