Revision 70:885f1c2f67b1, committed 2016-02-25

Comitter:

mbed_official

Date:

Thu Feb 25 09:15:10 2016 +0000

Parent:

69:41db872bbc3a

Child:

71:a5b1c83f05dc

Commit message:

Synchronized with git revision 5b9a91ed96ad6e0323c13ab11b9f8005e38f0ca0

Full URL: https://github.com/mbedmicro/mbed/commit/5b9a91ed96ad6e0323c13ab11b9f8005e38f0ca0/

[STM32F7 family] fix issue with RTC init

Changed in this revision

--- a/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c	Mon Feb 22 13:15:10 2016 +0000
+++ b/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c	Thu Feb 25 09:15:10 2016 +0000
@@ -40,59 +40,58 @@
     RCC_OscInitTypeDef RCC_OscInitStruct;
     uint32_t rtc_freq = 0;
 
-        RtcHandle.Instance = RTC;
+    RtcHandle.Instance = RTC;
+
+    // Enable Power clock
+    __PWR_CLK_ENABLE();
 
-        // Enable Power clock
-        __PWR_CLK_ENABLE();
+    // Enable access to Backup domain
+    HAL_PWR_EnableBkUpAccess();
+
+    // Reset Backup domain
+    __HAL_RCC_BACKUPRESET_FORCE();
+    __HAL_RCC_BACKUPRESET_RELEASE();
 
-        // Enable access to Backup domain
-        HAL_PWR_EnableBkUpAccess();
-
-        // Reset Backup domain
-        __HAL_RCC_BACKUPRESET_FORCE();
-        __HAL_RCC_BACKUPRESET_RELEASE();
-
-        // Enable LSE Oscillator
-        RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
+    // Enable LSE Oscillator
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
+    RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
+    RCC_OscInitStruct.LSEState       = RCC_LSE_ON; // External 32.768 kHz clock on OSC_IN/OSC_OUT
+    if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) {
+        // Connect LSE to RTC
+        __HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSE);
+        __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
+        rtc_freq = LSE_VALUE;
+    } else {
+        // Enable LSI clock
+        RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
         RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
-        RCC_OscInitStruct.LSEState       = RCC_LSE_ON; // External 32.768 kHz clock on OSC_IN/OSC_OUT
-        if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) {
-            // Connect LSE to RTC
-            __HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSE);
-            __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
-            rtc_freq = LSE_VALUE;
-        } else {
-            // Enable LSI clock
-            RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-            RCC_OscInitStruct.PLL.PLLState   = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
-            RCC_OscInitStruct.LSEState       = RCC_LSE_OFF;
-            RCC_OscInitStruct.LSIState       = RCC_LSI_ON;
-            if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-                error("RTC error: LSI clock initialization failed.");
-            }
-            // Connect LSI to RTC
-            __HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
-            __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
-            // [TODO] This value is LSI typical value. To be measured precisely using a timer input capture
-            rtc_freq = LSI_VALUE;
+        RCC_OscInitStruct.LSEState       = RCC_LSE_OFF;
+        RCC_OscInitStruct.LSIState       = RCC_LSI_ON;
+        if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+            error("RTC error: LSI clock initialization failed.");
         }
-
-    if((RTC->ISR & RTC_ISR_INITS) ==  RTC_ISR_INITS) {     // RTC initialization and status register (RTC_ISR), cold start (with no backup domain power) RTC reset value
+        // Connect LSI to RTC
+        __HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
+        __HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
+        // [TODO] This value is LSI typical value. To be measured precisely using a timer input capture
+        rtc_freq = LSI_VALUE;
+    }
 
-        // Enable RTC
-        __HAL_RCC_RTC_ENABLE();
+    // Check if RTC is already initialized
+    if ((RTC->ISR & RTC_ISR_INITS) ==  RTC_ISR_INITS) return;
 
-        RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-        RtcHandle.Init.AsynchPrediv   = 127;
-        RtcHandle.Init.SynchPrediv    = (rtc_freq / 128) - 1;
-        RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-        RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-        RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+    // Enable RTC
+    __HAL_RCC_RTC_ENABLE();
 
-        if (HAL_RTC_Init(&RtcHandle) != HAL_OK) {
-            error("RTC error: RTC initialization failed.");
-        }
+    RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+    RtcHandle.Init.AsynchPrediv   = 127;
+    RtcHandle.Init.SynchPrediv    = (rtc_freq / 128) - 1;
+    RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+    RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+    RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
 
+    if (HAL_RTC_Init(&RtcHandle) != HAL_OK) {
+        error("RTC error: RTC initialization failed.");
     }
 }