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

Fix error in recent LSE-related fix: Requires CONFIG_STM32_PWR, or will not build correctly

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-16 12:43:35 -06:00
parent 6c1678d1d9
commit bf0a3bf0c8
1 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
arch/arm/src/stm32/stm32_rcc.c
View File

@ -101,6 +101,53 @@
# define RCC_XXX_YYYRST RCC_BDCR_BDRST # define RCC_XXX_YYYRST RCC_BDCR_BDRST
#endif #endif
/****************************************************************************
* Public Functions
****************************************************************************/
/************************************************************************************
* Name: rcc_enablebkp
*
* Description:
* The RTC needs to reset the Backup Domain to change RTCSEL and resetting the
* Backup Domain renders to disabling the LSE as consequence. In order to avoid
* resetting the Backup Domain when we already configured LSE we will reset the
* Backup Domain early (here).
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
************************************************************************************/
#ifdef CONFIG_STM32_PWR
static inline rcc_enablebkp(void)
{
uint32_t regval;
/* Check if the RTC is already configured */
regval = getreg32(RTC_MAGIC_REG);
if (regval != RTC_MAGIC)
{
(void)stm32_pwr_enablebkp(true);
/* We might be changing RTCSEL - to ensure such changes work, we must
* reset the backup domain (having backed up the RTC_MAGIC token)
*/
modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_YYYRST);
modifyreg32(STM32_RCC_XXX, RCC_XXX_YYYRST, 0);
(void)stm32_pwr_enablebkp(false);
}
}
#else
# define rcc_enablebkp()
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
@ -134,28 +181,9 @@ void stm32_clockconfig(void)
rcc_reset(); rcc_reset();
/* The RTC needs to reset the Backup Domain to change RTCSEL and resetting the /* Reset backup domain */
* Backup Domain renders to disabling the LSE as consequence. In order to avoid
* resetting the Backup Domain when we already configured LSE we will reset the
* Backup Domain early (here).
*/
/* Check if the RTC is already configured */ rcc_enablebkp();
regval = getreg32(RTC_MAGIC_REG);
if (regval != RTC_MAGIC)
{
(void)stm32_pwr_enablebkp(true);
/* We might be changing RTCSEL - to ensure such changes work, we must
* reset the backup domain (having backed up the RTC_MAGIC token)
*/
modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_YYYRST);
modifyreg32(STM32_RCC_XXX, RCC_XXX_YYYRST, 0);
(void)stm32_pwr_enablebkp(false);
}
#if defined(CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG) #if defined(CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG)