Merge pull request #8826 from cmonr/revert-8272

Revert "Merge pull request #8272 from NXPmicro/Ensure_RTC_OSC_Start"
ARMmbed · Nov 21, 2018 · e38d47f · e38d47f
2 parents 9aef9d3 + a5bef60
commit e38d47f
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 376 deletions.
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/mbed_overrides.c
@@ -17,37 +17,12 @@
 
 #define CRC16
 #include "crc.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 // called before main
 void mbed_sdk_init()
 {
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
     BOARD_BootClockRUN();
-
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
 }
 
 // Change the NMI pin to an input. This allows NMI pin to
@@ -59,6 +34,13 @@ void NMI_Handler(void)
     gpio_init_in(&gpio, PTA4);
 }
 
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
+}
+
 // Provide ethernet devices with a semi-unique MAC address from the UUID
 void mbed_mac_address(char *mac)
 {
@@ -73,7 +55,7 @@ void mbed_mac_address(char *mac)
 
     // generate three CRC16's using different slices of the UUID
     MAC[0] = crcSlow((const uint8_t *)UID, 8);  // most significant half-word
-    MAC[1] = crcSlow((const uint8_t *)UID, 12);
+    MAC[1] = crcSlow((const uint8_t *)UID, 12); 
     MAC[2] = crcSlow((const uint8_t *)UID, 16); // least significant half word
 
     // The network stack expects an array of 6 bytes

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/mbed_overrides.c
@@ -14,37 +14,12 @@
  * limitations under the License.
  */
 #include "gpio_api.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 // called before main
 void mbed_sdk_init()
 {
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
     BOARD_BootClockRUN();
-
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
 }
 
 // Change the NMI pin to an input. This allows NMI pin to
@@ -56,6 +31,13 @@ void NMI_Handler(void)
     gpio_init_in(&gpio, PTA4);
 }
 
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
+}
+
 // Set the UART clock source
 void serial_clock_init(void)
 {

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_UBRIDGE/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_UBRIDGE/mbed_overrides.c
@@ -17,18 +17,13 @@
 #include "fsl_smc.h"
 #include "fsl_rcm.h"
 #include "fsl_pmc.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 //!< this contains the wakeup source
 rcm_reset_source_t kinetisResetSource;
 
 // called before main
-void mbed_sdk_init()
-{
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
+void mbed_sdk_init() {
     SMC_SetPowerModeProtection(SMC, kSMC_AllowPowerModeAll);
 
     // check the power mode source
@@ -41,26 +36,6 @@ void mbed_sdk_init()
 
     BOARD_BootClockRUN();
 
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
 }
 
 // Change the NMI pin to an input. This allows NMI pin to
@@ -72,6 +47,13 @@ void NMI_Handler(void)
     gpio_init_in(&gpio, PTA4);
 }
 
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
+}
+
 // Set the UART clock source
 void serial_clock_init(void)
 {

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/mbed_overrides.c
@@ -15,40 +15,22 @@
  */
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 // called before main - implement here if board needs it otherwise, let
 //  the application override this if necessary
 void mbed_sdk_init()
 {
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
     BOARD_BootClockRUN();
     /* Set the TPM clock source to be IRC48M, do not change as TPM2 is used for the usticker */
     CLOCK_SetTpmClock(1U);
+}
 
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
 }
 
 // Change the NMI pin to an input. This allows NMI pin to

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/mbed_overrides.c
@@ -15,40 +15,22 @@
  */
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 // called before main - implement here if board needs it otherwise, let
 //  the application override this if necessary
 void mbed_sdk_init()
 {
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
     BOARD_BootClockRUN();
     /* Set the TPM clock source to be IRC48M, do not change as TPM2 is used for the usticker */
     CLOCK_SetTpmClock(1U);
+}
 
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
 }
 
 // Change the NMI pin to an input. This allows NMI pin to

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/mbed_overrides.c
@@ -15,38 +15,20 @@
  */
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 // called before main - implement here if board needs it otherwise, let
 //  the application override this if necessary
 void mbed_sdk_init()
 {
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
     BOARD_BootClockRUN();
+}
 
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
 }
 
 // Change the NMI pin to an input. This allows NMI pin to

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_USENSE/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_USENSE/mbed_overrides.c
@@ -17,18 +17,13 @@
 #include "fsl_smc.h"
 #include "fsl_rcm.h"
 #include "fsl_pmc.h"
-#include "fsl_rtc.h"
 #include "fsl_clock_config.h"
 
 //!< this contains the wakeup source
 rcm_reset_source_t kinetisResetSource;
 
 // called before main
-void mbed_sdk_init()
-{
-    rtc_config_t rtc_basic_config;
-    uint32_t u32cTPR_counter = 0;
-
+void mbed_sdk_init() {
     SMC_SetPowerModeProtection(SMC, kSMC_AllowPowerModeAll);
 
     // check the power mode source
@@ -40,27 +35,6 @@ void mbed_sdk_init()
     }
 
     BOARD_BootClockRUN();
-
-    CLOCK_EnableClock(kCLOCK_Rtc0);
-
-    /* Check if the Rtc oscillator is enabled */
-    if ((RTC->CR & RTC_CR_OSCE_MASK) == 0u) {
-        /* Setup the 32K RTC OSC */
-        RTC_Init(RTC, &rtc_basic_config);
-
-        /* Enable the RTC 32KHz oscillator */
-        RTC->CR |= RTC_CR_OSCE_MASK;
-
-        /* Start the RTC time counter */
-        RTC_StartTimer(RTC);
-
-        /* Verify TPR register reaches 4096 counts */
-        while (u32cTPR_counter < 4096) {
-            u32cTPR_counter = RTC->TPR;
-        }
-        /* 32kHz Oscillator is ready. */
-        RTC_Deinit(RTC);
-    }
 }
 
 // Change the NMI pin to an input. This allows NMI pin to
@@ -72,6 +46,15 @@ void NMI_Handler(void)
     gpio_init_in(&gpio, PTA4);
 }
 
+#if DEVICE_RTC || DEVICE_LPTICKER
+// Enable the RTC oscillator if available on the board
+void rtc_setup_oscillator(RTC_Type *base)
+{
+    /* Enable the RTC oscillator */
+    RTC->CR |= RTC_CR_OSCE_MASK;
+}
+#endif
+
 // Set the UART clock source
 void serial_clock_init(void)
 {