shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix clock init by setting flash latency last for low freqs

Browse Source
This commit is contained in:
Conor Patrick 2019-03-02 20:05:27 -05:00
parent 7a98764a5b
commit 246dea8a44
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
targets/stm32l432/src/init.c
View File

@ -245,12 +245,6 @@ void SystemClock_Config_LF4(void)
{ {
SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN); SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN);
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1); LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
LL_RCC_LSI_Enable(); LL_RCC_LSI_Enable();
@ -299,8 +293,12 @@ void SystemClock_Config_LF4(void)
/* SysTick_IRQn interrupt configuration */ /* SysTick_IRQn interrupt configuration */
NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0)); NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
} }
// 8MHz // 8MHz
@ -308,28 +306,22 @@ void SystemClock_Config_LF8(void)
{ {
SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN); SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN);
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1); LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
LL_RCC_LSI_Enable(); LL_RCC_LSI_Enable();
/* Wait till LSI is ready */ /* Wait till LSI is ready */
// while(LL_RCC_LSI_IsReady() != 1) while(LL_RCC_LSI_IsReady() != 1)
// { {
//
// } }
LL_RCC_MSI_Enable(); LL_RCC_MSI_Enable();
/* Wait till MSI is ready */ /* Wait till MSI is ready */
// while(LL_RCC_MSI_IsReady() != 1) while(LL_RCC_MSI_IsReady() != 1)
// { {
//
// } }
LL_RCC_MSI_EnableRangeSelection(); LL_RCC_MSI_EnableRangeSelection();
LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_7); LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_7);
@ -339,10 +331,10 @@ void SystemClock_Config_LF8(void)
LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI); LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI);
/* Wait till System clock is ready */ /* Wait till System clock is ready */
// while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI)
// { {
//
// } }
LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1); LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1); LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
@ -362,6 +354,12 @@ void SystemClock_Config_LF8(void)
/* SysTick_IRQn interrupt configuration */ /* SysTick_IRQn interrupt configuration */
NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0)); NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
} }
// 16MHz // 16MHz
@ -369,12 +367,6 @@ void SystemClock_Config_LF16(void)
{ {
SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN); SET_BIT(RCC->APB1ENR1, RCC_APB1ENR1_PWREN);
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE2); LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE2);
LL_RCC_LSI_Enable(); LL_RCC_LSI_Enable();
@ -384,6 +376,7 @@ void SystemClock_Config_LF16(void)
{ {
} }
LL_RCC_MSI_Enable(); LL_RCC_MSI_Enable();
/* Wait till MSI is ready */ /* Wait till MSI is ready */
@ -408,7 +401,7 @@ void SystemClock_Config_LF16(void)
LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1); LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1); LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_8);
LL_Init1msTick(16000000); LL_Init1msTick(16000000);
@ -423,6 +416,13 @@ void SystemClock_Config_LF16(void)
/* SysTick_IRQn interrupt configuration */ /* SysTick_IRQn interrupt configuration */
NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0)); NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
LL_FLASH_SetLatency(LL_FLASH_LATENCY_0);
if(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_0)
{
Error_Handler();
}
} }

2
targets/stm32l432/src/system_stm32l4xx.c
View File

@ -222,7 +222,7 @@ void SystemInit(void)
RCC->CIER = 0x00000000U; RCC->CIER = 0x00000000U;
// TODO this is causing boot issues for old bootloader // TODO this is causing boot issues for old bootloader
// device_set_clock_rate(DEVICE_LOW_POWER_IDLE); device_set_clock_rate(DEVICE_LOW_POWER_IDLE);
} }