ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13939 from jeromecoutant/PR_LSEDRIVE 

STM32: LSE DRIVE feature update
pull/13957/head
Martin Kojtal 2020-11-24 14:13:52 +00:00 committed by GitHub
parent 9de73f89ef 29af76fcca
commit ced4aa6e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
targets/TARGET_STM/TARGET_STM32F0/common_objects.h
View File

@ -38,6 +38,7 @@
#include "stm32f0xx_ll_tim.h" #include "stm32f0xx_ll_tim.h"
#include "stm32f0xx_ll_pwr.h" #include "stm32f0xx_ll_pwr.h"
#include "stm32f0xx_ll_crc.h" #include "stm32f0xx_ll_crc.h"
#include "stm32f0xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32F3/objects.h
View File

@ -41,6 +41,7 @@
#include "stm32f3xx_ll_pwr.h" #include "stm32f3xx_ll_pwr.h"
#include "stm32f3xx_ll_adc.h" #include "stm32f3xx_ll_adc.h"
#include "stm32f3xx_ll_rtc.h" #include "stm32f3xx_ll_rtc.h"
#include "stm32f3xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32F4/common_objects.h
View File

@ -39,6 +39,7 @@
#include "stm32f4xx_ll_pwr.h" #include "stm32f4xx_ll_pwr.h"
#include "stm32f4xx_ll_adc.h" #include "stm32f4xx_ll_adc.h"
#include "stm32f4xx_ll_rtc.h" #include "stm32f4xx_ll_rtc.h"
#include "stm32f4xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32F7/objects.h
View File

@ -40,6 +40,7 @@
#include "stm32f7xx_ll_adc.h" #include "stm32f7xx_ll_adc.h"
#include "stm32f7xx_ll_rtc.h" #include "stm32f7xx_ll_rtc.h"
#include "stm32f7xx_ll_pwr.h" #include "stm32f7xx_ll_pwr.h"
#include "stm32f7xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32G4/objects.h
View File

@ -24,6 +24,7 @@
#include "stm32g4xx_ll_tim.h" #include "stm32g4xx_ll_tim.h"
#include "stm32g4xx_ll_pwr.h" #include "stm32g4xx_ll_pwr.h"
#include "stm32g4xx_ll_rtc.h" #include "stm32g4xx_ll_rtc.h"
#include "stm32g4xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
targets/TARGET_STM/TARGET_STM32H7/objects.h
View File

@ -23,9 +23,9 @@
#include "stm32h7xx_ll_usart.h" #include "stm32h7xx_ll_usart.h"
#include "stm32h7xx_ll_rtc.h" #include "stm32h7xx_ll_rtc.h"
#include "stm32h7xx_ll_tim.h" #include "stm32h7xx_ll_tim.h"
#include "stm32h7xx_ll_rcc.h"
#if defined(DUAL_CORE) #if defined(DUAL_CORE)
#include "stm32h7xx_ll_hsem.h" #include "stm32h7xx_ll_hsem.h"
#include "stm32h7xx_ll_rcc.h"
#include "stm32h7xx_ll_cortex.h" #include "stm32h7xx_ll_cortex.h"
#endif /* CONFIG_STM32H7_DUAL_CORE */ #endif /* CONFIG_STM32H7_DUAL_CORE */
#include "stm32h7xx_ll_pwr.h" #include "stm32h7xx_ll_pwr.h"

1
targets/TARGET_STM/TARGET_STM32L0/objects.h
View File

@ -26,6 +26,7 @@
#include "stm32l0xx_ll_usart.h" #include "stm32l0xx_ll_usart.h"
#include "stm32l0xx_ll_tim.h" #include "stm32l0xx_ll_tim.h"
#include "stm32l0xx_ll_pwr.h" #include "stm32l0xx_ll_pwr.h"
#include "stm32l0xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32L4/objects.h
View File

@ -29,6 +29,7 @@
#include "stm32l4xx_ll_tim.h" #include "stm32l4xx_ll_tim.h"
#include "stm32l4xx_ll_rtc.h" #include "stm32l4xx_ll_rtc.h"
#include "stm32l4xx_ll_pwr.h" #include "stm32l4xx_ll_pwr.h"
#include "stm32l4xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
targets/TARGET_STM/TARGET_STM32L5/objects.h
View File

@ -25,6 +25,7 @@
#include "stm32l5xx_ll_tim.h" #include "stm32l5xx_ll_tim.h"
#include "stm32l5xx_ll_rtc.h" #include "stm32l5xx_ll_rtc.h"
#include "stm32l5xx_ll_pwr.h" #include "stm32l5xx_ll_pwr.h"
#include "stm32l5xx_ll_rcc.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

25
targets/TARGET_STM/mbed_overrides.c
View File

@ -42,7 +42,7 @@ extern void SetSysClock(void);
# if defined(MBED_CONF_TARGET_LSE_DRIVE_LOAD_LEVEL) # if defined(MBED_CONF_TARGET_LSE_DRIVE_LOAD_LEVEL)
# define LSE_DRIVE_LOAD_LEVEL MBED_CONF_TARGET_LSE_DRIVE_LOAD_LEVEL # define LSE_DRIVE_LOAD_LEVEL MBED_CONF_TARGET_LSE_DRIVE_LOAD_LEVEL
# else # else
# if defined(RCC_LSE_HIGHDRIVE_MODE) # if defined(RCC_LSE_HIGHDRIVE_MODE) // STM32F4
# define LSE_DRIVE_LOAD_LEVEL RCC_LSE_LOWPOWER_MODE # define LSE_DRIVE_LOAD_LEVEL RCC_LSE_LOWPOWER_MODE
# else # else
# define LSE_DRIVE_LOAD_LEVEL RCC_LSEDRIVE_LOW # define LSE_DRIVE_LOAD_LEVEL RCC_LSEDRIVE_LOW
@ -70,17 +70,6 @@ extern void SetSysClock(void);
*/ */
static void LSEDriveConfig(void) { static void LSEDriveConfig(void) {
// this config can be changed only when LSE is stopped
// LSE could be enabled before a reset and will remain running, disable first
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
{
error("LSEDriveConfig : failed to disable LSE\n");
}
// set LSE drive level. Exception only for F4_g2 series
HAL_PWR_EnableBkUpAccess(); HAL_PWR_EnableBkUpAccess();
#if defined(__HAL_RCC_LSEDRIVE_CONFIG) #if defined(__HAL_RCC_LSEDRIVE_CONFIG)
__HAL_RCC_LSEDRIVE_CONFIG(LSE_DRIVE_LOAD_LEVEL); __HAL_RCC_LSEDRIVE_CONFIG(LSE_DRIVE_LOAD_LEVEL);
@ -180,9 +169,10 @@ void mbed_sdk_init()
/* Configure the System clock source, PLL Multiplier and Divider factors, /* Configure the System clock source, PLL Multiplier and Divider factors,
AHB/APBx prescalers and Flash settings */ AHB/APBx prescalers and Flash settings */
#if defined(LSE_CONFIG_AVAILABLE) #if defined(LSE_CONFIG_AVAILABLE)
// LSE maybe used later, but crystal load drive setting is necessary before // LSE oscillator drive capability set before LSE is started
// enabling LSE if (!LL_RCC_LSE_IsReady()) {
LSEDriveConfig(); LSEDriveConfig();
}
#endif #endif
SetSysClock(); SetSysClock();
SystemCoreClockUpdate(); SystemCoreClockUpdate();
@ -199,16 +189,19 @@ void mbed_sdk_init()
/* wait until CPU2 wakes up from stop mode */ /* wait until CPU2 wakes up from stop mode */
while (LL_RCC_D2CK_IsReady() == 0); while (LL_RCC_D2CK_IsReady() == 0);
#endif /* CORE_M4 */ #endif /* CORE_M4 */
#else /* Single core */ #else /* Single core */
// Update the SystemCoreClock variable. // Update the SystemCoreClock variable.
SystemCoreClockUpdate(); SystemCoreClockUpdate();
HAL_Init(); HAL_Init();
/* Configure the System clock source, PLL Multiplier and Divider factors,
AHB/APBx prescalers and Flash settings */
#if defined(LSE_CONFIG_AVAILABLE) #if defined(LSE_CONFIG_AVAILABLE)
// LSE oscillator drive capability set before LSE is started
if (!LL_RCC_LSE_IsReady()) {
LSEDriveConfig(); LSEDriveConfig();
}
#endif #endif
SetSysClock(); SetSysClock();
SystemCoreClockUpdate(); SystemCoreClockUpdate();
#endif /* DUAL_CORE */ #endif /* DUAL_CORE */

30
targets/targets.json
View File

@ -1201,8 +1201,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"macros_add": [ "macros_add": [
@ -1415,8 +1414,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"device_has_add": [ "device_has_add": [
@ -2178,8 +2176,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"overrides": { "overrides": {
@ -2426,8 +2423,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"extra_labels_add": [ "extra_labels_add": [
@ -2534,8 +2530,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"extra_labels_add": [ "extra_labels_add": [
@ -2702,8 +2697,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"components_add": [ "components_add": [
@ -2970,8 +2964,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"macros_add": [ "macros_add": [
@ -3208,8 +3201,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"macros_add": [ "macros_add": [
@ -3745,8 +3737,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"overrides": { "overrides": {
@ -3851,8 +3842,7 @@
}, },
"lse_drive_load_level": { "lse_drive_load_level": {
"help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH", "help": "HSE drive load level RCC_LSEDRIVE_LOW | RCC_LSEDRIVE_MEDIUMLOW | RCC_LSEDRIVE_MEDIUMHIGH | RCC_LSEDRIVE_HIGH",
"value": "RCC_LSEDRIVE_LOW", "value": "RCC_LSEDRIVE_LOW"
"macro_name": "TARGET_LSE_DRIVE_LOAD_LEVEL"
} }
}, },
"macros_add": [ "macros_add": [