Merged in david_s5/nuttx/upstream_to_greg_HSI_ON_re (pull request #193)
HSI should not be turned off
This commit is contained in:
commit
bd696b8c40
@ -95,10 +95,10 @@ static inline void rcc_reset(void)
|
|||||||
|
|
||||||
putreg32(0x00000000, STM32_RCC_CFGR);
|
putreg32(0x00000000, STM32_RCC_CFGR);
|
||||||
|
|
||||||
/* Reset HSION, HSEON, CSSON and PLLON bits */
|
/* Reset HSEON, CSSON and PLLON bits */
|
||||||
|
|
||||||
regval = getreg32(STM32_RCC_CR);
|
regval = getreg32(STM32_RCC_CR);
|
||||||
regval &= ~(RCC_CR_HSION | RCC_CR_HSEON | RCC_CR_CSSON | RCC_CR_PLLON);
|
regval &= ~(RCC_CR_HSEON | RCC_CR_CSSON | RCC_CR_PLLON);
|
||||||
putreg32(regval, STM32_RCC_CR);
|
putreg32(regval, STM32_RCC_CR);
|
||||||
|
|
||||||
/* Reset PLLCFGR register to reset default */
|
/* Reset PLLCFGR register to reset default */
|
||||||
@ -619,11 +619,6 @@ static void stm32_stdclockconfig(void)
|
|||||||
volatile int32_t timeout;
|
volatile int32_t timeout;
|
||||||
|
|
||||||
#ifdef STM32_BOARD_USEHSI
|
#ifdef STM32_BOARD_USEHSI
|
||||||
/* Enable Internal High-Speed Clock (HSI) */
|
|
||||||
|
|
||||||
regval = getreg32(STM32_RCC_CR);
|
|
||||||
regval |= RCC_CR_HSION; /* Enable HSI */
|
|
||||||
putreg32(regval, STM32_RCC_CR);
|
|
||||||
|
|
||||||
/* Wait until the HSI is ready (or until a timeout elapsed) */
|
/* Wait until the HSI is ready (or until a timeout elapsed) */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user