sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 RTCC: Make back-up register and magic value used by RTCC configurable. From David Sidrane

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-06 16:26:59 -06:00
parent e1e0fc259c
commit 8461827dcd
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/src/stm32/Kconfig
View File

@ -3406,6 +3406,17 @@ config STM32_HAVE_RTC_SUBSECONDS
bool bool
default n default n
config RTC_MAGIC_REG
int "The BKP register used to store/check the Magic value to determine if RTC is set already"
default 0
range 0 19
depends on RTC
config RTC_MAGIC
hex "Value used as Magic to determine if RTC is set already"
default 0xfacefeee
depends on RTC
choice choice
prompt "RTC clock source" prompt "RTC clock source"
default RTC_LSECLOCK default RTC_LSECLOCK

19
arch/arm/src/stm32/stm32_rtcc.c
View File

@ -87,11 +87,20 @@
# endif # endif
#endif #endif
#if !defined(CONFIG_RTC_MAGIC)
# define CONFIG_RTC_MAGIC (0xfacefeee)
#endif
#if !defined(CONFIG_RTC_MAGIC_REG)
# define CONFIG_RTC_MAGIC_REG STM32_RTC_BKR(0)
#endif
/* Constants ************************************************************************/ /* Constants ************************************************************************/
#define SYNCHRO_TIMEOUT (0x00020000) #define SYNCHRO_TIMEOUT (0x00020000)
#define INITMODE_TIMEOUT (0x00010000) #define INITMODE_TIMEOUT (0x00010000)
#define RTC_MAGIC (0xfacefeee) #define RTC_MAGIC CONFIG_RTC_MAGIC
#define RTC_MAGIC_REG CONFIG_RTC_MAGIC_REG
/* Proxy definitions to make the same code work for all the STM32 series ************/ /* Proxy definitions to make the same code work for all the STM32 series ************/
@ -189,7 +198,7 @@ static void rtc_dumpregs(FAR const char *msg)
rtclldbg(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR)); rtclldbg(" TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR)); rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR)); rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
rtclldbg(" BK0: %08x\n", getreg32(STM32_RTC_BK0R)); rtclldbg("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG));
} }
#else #else
# define rtc_dumpregs(msg) # define rtc_dumpregs(msg)
@ -616,7 +625,7 @@ int up_rtcinitialize(void)
/* Select the clock source */ /* Select the clock source */
/* Save the token before losing it when resetting */ /* Save the token before losing it when resetting */
regval = getreg32(STM32_RTC_BK0R); regval = getreg32(RTC_MAGIC_REG);
stm32_pwr_enablebkp(true); stm32_pwr_enablebkp(true);
@ -688,7 +697,7 @@ int up_rtcinitialize(void)
/* Remember that the RTC is initialized */ /* Remember that the RTC is initialized */
putreg32(RTC_MAGIC, STM32_RTC_BK0R); putreg32(RTC_MAGIC, RTC_MAGIC_REG);
/* Enable the RTC Clock by setting the RTCEN bit in the RCC register */ /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
@ -751,7 +760,7 @@ int up_rtcinitialize(void)
/* Remember that the RTC is initialized */ /* Remember that the RTC is initialized */
putreg32(RTC_MAGIC, STM32_RTC_BK0R); putreg32(RTC_MAGIC, RTC_MAGIC_REG);
} }
else else
{ {