Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[XXX_F746XG] Move erasing of BkUpR in RTC API #1649

Merged
merged 2 commits into from
Apr 4, 2016
Merged

[XXX_F746XG] Move erasing of BkUpR in RTC API #1649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e20d0
[XXX_F746XG] Move erasing of BkUpR in RTC API
dbestm Apr 4, 2016
4e7109e
Merge remote-tracking branch 'refs/remotes/origin/master' into dev_xx…
dbestm Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F7/rtc_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ void rtc_init(void)

RtcHandle.Instance = RTC;

// 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();

#if !DEVICE_RTC_LSI
// Enable LSE Oscillator
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
Expand All @@ -71,6 +61,16 @@ void rtc_init(void)
error("Cannot initialize RTC with LSE\n");
}
#else
// 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 LSI clock
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
Expand Down Expand Up @@ -103,6 +103,7 @@ void rtc_init(void)

void rtc_free(void)
{
#if DEVICE_RTC_LSI
// Enable Power clock
__PWR_CLK_ENABLE();

Expand All @@ -115,6 +116,7 @@ void rtc_free(void)

// Disable access to Backup domain
HAL_PWR_DisableBkUpAccess();
#endif

// Disable LSI and LSE clocks
RCC_OscInitTypeDef RCC_OscInitStruct;
Expand Down