DongEun Koak
mbed library sources
Dependents: Freedman_v2 Nucleo_i2c_OLED_BME280_copy
Fork of
mbed-src
by 
mbed official
Revision 608:14dd4108b341, committed 2015-08-14
- Comitter:
- mbed_official
- Date:
- Fri Aug 14 08:45:08 2015 +0100
- Parent:
- 607:ae528ef7bd3d
- Child:
- 609:f2ee788e32e7
- Commit message:
- Synchronized with git revision 77a08517db34a83c9b5478adf089e5a641797b2a
Full URL: https://github.com/mbedmicro/mbed/commit/77a08517db34a83c9b5478adf089e5a641797b2a/
[Silicon Labs] Fix incorrect clock selection
Changed in this revision
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/device_peripherals.h Thu Aug 13 15:45:09 2015 +0100 +++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/device_peripherals.h Fri Aug 14 08:45:08 2015 +0100 @@ -32,12 +32,12 @@ /* Clocks */ /* Clock definitions */ -#define LFXO cmuSelect_LFXO -#define HFXO cmuSelect_HFXO -#define LFRCO cmuSelect_LFRCO -#define HFRCO cmuSelect_HFRCO +#define LFXO 0 +#define HFXO 1 +#define LFRCO 2 +#define HFRCO 3 #if !defined(_EFM32_GECKO_FAMILY) -#define ULFRCO cmuSelect_ULFRCO +#define ULFRCO 4 #endif /* Low Energy peripheral clock source.
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/device_peripherals.h Thu Aug 13 15:45:09 2015 +0100 +++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/device_peripherals.h Fri Aug 14 08:45:08 2015 +0100 @@ -32,12 +32,12 @@ /* Clocks */ /* Clock definitions */ -#define LFXO cmuSelect_LFXO -#define HFXO cmuSelect_HFXO -#define LFRCO cmuSelect_LFRCO -#define HFRCO cmuSelect_HFRCO +#define LFXO 0 +#define HFXO 1 +#define LFRCO 2 +#define HFRCO 3 #if !defined(_EFM32_GECKO_FAMILY) -#define ULFRCO cmuSelect_ULFRCO +#define ULFRCO 4 #endif /* Low Energy peripheral clock source.
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/device_peripherals.h Thu Aug 13 15:45:09 2015 +0100 +++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/device_peripherals.h Fri Aug 14 08:45:08 2015 +0100 @@ -32,12 +32,12 @@ /* Clocks */ /* Clock definitions */ -#define LFXO cmuSelect_LFXO -#define HFXO cmuSelect_HFXO -#define LFRCO cmuSelect_LFRCO -#define HFRCO cmuSelect_HFRCO +#define LFXO 0 +#define HFXO 1 +#define LFRCO 2 +#define HFRCO 3 #if !defined(_EFM32_GECKO_FAMILY) -#define ULFRCO cmuSelect_ULFRCO +#define ULFRCO 4 #endif /* Low Energy peripheral clock source.
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/device_peripherals.h Thu Aug 13 15:45:09 2015 +0100 +++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/device_peripherals.h Fri Aug 14 08:45:08 2015 +0100 @@ -32,12 +32,12 @@ /* Clocks */ /* Clock definitions */ -#define LFXO cmuSelect_LFXO -#define HFXO cmuSelect_HFXO -#define LFRCO cmuSelect_LFRCO -#define HFRCO cmuSelect_HFRCO +#define LFXO 0 +#define HFXO 1 +#define LFRCO 2 +#define HFRCO 3 #if !defined(_EFM32_GECKO_FAMILY) -#define ULFRCO cmuSelect_ULFRCO +#define ULFRCO 4 #endif /* Low Energy peripheral clock source.
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32ZG_STK3200/device_peripherals.h Thu Aug 13 15:45:09 2015 +0100 +++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32ZG_STK3200/device_peripherals.h Fri Aug 14 08:45:08 2015 +0100 @@ -29,12 +29,12 @@ /* Clocks */ /* Clock definitions */ -#define LFXO cmuSelect_LFXO -#define HFXO cmuSelect_HFXO -#define LFRCO cmuSelect_LFRCO -#define HFRCO cmuSelect_HFRCO +#define LFXO 0 +#define HFXO 1 +#define LFRCO 2 +#define HFRCO 3 #if !defined(_EFM32_GECKO_FAMILY) -#define ULFRCO cmuSelect_ULFRCO +#define ULFRCO 4 #endif /* Low Energy peripheral clock source.
--- a/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/mbed_overrides.c Thu Aug 13 15:45:09 2015 +0100
+++ b/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/mbed_overrides.c Fri Aug 14 08:45:08 2015 +0100
@@ -34,10 +34,12 @@
/* Set up the clock sources for this chip */
#if( CORE_CLOCK_SOURCE == HFXO)
- CMU_ClockSelectSet(cmuClock_HF, HFXO);
+ CMU_ClockSelectSet(cmuClock_HF, cmuSelect_HFXO);
+ CMU_ClockSelectSet(cmuClock_HFPER, cmuSelect_HFXO);
SystemHFXOClockSet(HFXO_FREQUENCY);
#elif( CORE_CLOCK_SOURCE == HFRCO)
- CMU_ClockSelectSet(cmuClock_HF, HFRCO);
+ CMU_ClockSelectSet(cmuClock_HF, cmuSelect_HFRCO);
+ CMU_ClockSelectSet(cmuClock_HFPER, cmuSelect_HFRCO);
CMU_HFRCOBandSet(HFRCO_FREQUENCY);
#else
#error "Core clock selection not valid (mbed_overrides.c)"
@@ -47,7 +49,7 @@
#if( LOW_ENERGY_CLOCK_SOURCE == LFXO )
#ifdef CMU_LFACLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFA, LFXO);
+ CMU_ClockSelectSet(cmuClock_LFA, cmuSelect_LFXO);
#endif
#ifdef CMU_LFBCLKSEL_REG
/* cmuClock_LFB (to date) only has LEUART peripherals.
@@ -58,31 +60,31 @@
//CMU_ClockSelectSet(cmuClock_LFB, LFXO);
#endif
#ifdef CMU_LFECLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFE, LFXO);
+ CMU_ClockSelectSet(cmuClock_LFE, cmuSelect_LFXO);
#endif
SystemLFXOClockSet(LFXO_FREQUENCY);
#elif( LOW_ENERGY_CLOCK_SOURCE == LFRCO )
#ifdef CMU_LFACLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFA, LFRCO);
+ CMU_ClockSelectSet(cmuClock_LFA, cmuSelect_LFRCO);
#endif
#ifdef CMU_LFBCLKSEL_REG
//CMU_ClockSelectSet(cmuClock_LFB, LFRCO);
#endif
#ifdef CMU_LFECLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFE, LFRCO);
+ CMU_ClockSelectSet(cmuClock_LFE, cmuSelect_LFRCO);
#endif
CMU_HFRCOBandSet(HFRCO_FREQUENCY);
#elif( LOW_ENERGY_CLOCK_SOURCE == ULFRCO)
#ifdef CMU_LFACLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFA, ULFRCO);
+ CMU_ClockSelectSet(cmuClock_LFA, cmuSelect_ULFRCO);
#endif
#ifdef CMU_LFBCLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFB, ULFRCO);
+ CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_ULFRCO);
#endif
#ifdef CMU_LFECLKSEL_REG
- CMU_ClockSelectSet(cmuClock_LFE, ULFRCO);
+ CMU_ClockSelectSet(cmuClock_LFE, cmuSelect_ULFRCO);
#endif
#else
#error "Low energy clock selection not valid"