Merge pull request #1091 from stevew817/master

0xc0170 · 0xc0170 · commit 4ba4c0d5b9e8 · 2015-05-05T07:45:05.000+01:00
Silicon Labs - Set the default status for an input pin to PullUp instead of PullDown
diff --git a/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/device_peripherals.h b/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/device_peripherals.h
@@ -64,7 +64,7 @@
 #define HFRCO_FREQUENCY 		CMU_HFRCOCTRL_BAND_14MHZ
 
 #define LFXO_FREQUENCY			32768
-#define HFXO_FREQUENCY			32000000
+#define HFXO_FREQUENCY			48000000
 
 #if (LOW_ENERGY_CLOCK_SOURCE == LFXO)
 #define LOW_ENERGY_CLOCK_FREQUENCY	LFXO_FREQUENCY
diff --git a/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/device_peripherals.h b/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/device_peripherals.h
@@ -64,7 +64,7 @@
 #define HFRCO_FREQUENCY 		CMU_HFRCOCTRL_BAND_14MHZ
 
 #define LFXO_FREQUENCY			32768
-#define HFXO_FREQUENCY			32000000
+#define HFXO_FREQUENCY			48000000
 
 #if (LOW_ENERGY_CLOCK_SOURCE == LFXO)
 #define LOW_ENERGY_CLOCK_FREQUENCY	LFXO_FREQUENCY
diff --git a/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/gpio_api.c b/libraries/mbed/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/gpio_api.c
@@ -59,6 +59,12 @@ void gpio_mode(gpio_t *obj, PinMode mode)
 {
     obj->mode = mode; // Update object
     pin_mode(obj->pin, mode); // Update register
+    
+    //Handle pullup for input
+    if(mode == InputPullUp) {
+        //Set DOUT
+        GPIO->P[obj->port & 0xF].DOUTSET = 1 << (obj->pin & 0xF);
+    }
 }
 
 // Used by DigitalInOut to set correct mode when direction is set

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@ void gpio_mode(gpio_t *obj, PinMode mode)`
`59`	`59`	`{`
`60`	`60`	`obj->mode = mode; // Update object`
`61`	`61`	`pin_mode(obj->pin, mode); // Update register`
	`62`	`+`
	`63`	`+ //Handle pullup for input`
	`64`	`+ if(mode == InputPullUp) {`
	`65`	`+ //Set DOUT`
	`66`	`+ GPIO->P[obj->port & 0xF].DOUTSET = 1 << (obj->pin & 0xF);`
	`67`	`+ }`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`// Used by DigitalInOut to set correct mode when direction is set`