From 5238c3f872929f2b1bdfe933590456bb52566fe0 Mon Sep 17 00:00:00 2001 From: Eug Krashtan Date: Sat, 28 Dec 2019 13:01:58 +0200 Subject: stm32: HSI selection fix; Pin swap rename; Add CAN selection Signed-off-by: Eug Krashtan Signed-off-by: Kevin O'Connor --- src/stm32/stm32f0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/stm32/stm32f0.c') diff --git a/src/stm32/stm32f0.c b/src/stm32/stm32f0.c index 6f9d994f..437747d8 100644 --- a/src/stm32/stm32f0.c +++ b/src/stm32/stm32f0.c @@ -192,7 +192,7 @@ armcm_main(void) FLASH->ACR = (1 << FLASH_ACR_LATENCY_Pos) | FLASH_ACR_PRFTBE; // Configure main clock - if (CONFIG_MACH_STM32F042 && CONFIG_STM32_CLOCK_REF_INTERNAL) + if (CONFIG_MACH_STM32F042 || CONFIG_STM32_CLOCK_REF_INTERNAL) hsi48_setup(); else pll_setup(); @@ -200,9 +200,9 @@ armcm_main(void) // Turn on hsi14 oscillator for ADC hsi14_setup(); - // Support alternate USB pins on stm32f042 + // Support alternate USB/CAN pins on stm32f042 #ifdef SYSCFG_CFGR1_PA11_PA12_RMP - if (CONFIG_STM32F042_USB_PIN_SWAP) { + if (CONFIG_STM32F042_PIN_SWAP) { enable_pclock(SYSCFG_BASE); SYSCFG->CFGR1 |= SYSCFG_CFGR1_PA11_PA12_RMP; } -- cgit v1.2.3-70-g09d2