diff --git a/include/libopencm3/efm32/lg/cmu.h b/include/libopencm3/efm32/lg/cmu.h
index 1081cd36..168955b7 100644
--- a/include/libopencm3/efm32/lg/cmu.h
+++ b/include/libopencm3/efm32/lg/cmu.h
@@ -139,7 +139,7 @@
 #define CMU_CTRL_HFXOBOOST_MASK		(0x3 << CMU_CTRL_HFXOBOOST_SHIFT)
 #define CMU_CTRL_HFXOBOOST(v)		\
 	(((v) << CMU_CTRL_HFXOBOOST_SHIFT) & CMU_CTRL_HFXOBOOST_MASK)
-#define CMU_CTRL_HFXOBOOST_50PCENT	CMU_CTRL_HFXOBOOST(1)
+#define CMU_CTRL_HFXOBOOST_50PCENT	CMU_CTRL_HFXOBOOST(0)
 #define CMU_CTRL_HFXOBOOST_70PCENT	CMU_CTRL_HFXOBOOST(1)
 #define CMU_CTRL_HFXOBOOST_80PCENT	CMU_CTRL_HFXOBOOST(2)
 #define CMU_CTRL_HFXOBOOST_100PCENT	CMU_CTRL_HFXOBOOST(3)
@@ -294,7 +294,7 @@
 #define CMU_CALCTRL_CONT		(1 << 6)
 
 #define CMU_CALCTRL_DOWNSEL_SHIFT	(3)
-#define CMU_CALCTRL_DOWNSEL_MASK	(0x3 << CMU_CALCTRL_DOWNSEL_SHIFT)
+#define CMU_CALCTRL_DOWNSEL_MASK	(0x7 << CMU_CALCTRL_DOWNSEL_SHIFT)
 #define CMU_CALCTRL_DOWNSEL(v)		\
 	(((v) << CMU_CALCTRL_DOWNSEL_SHIFT) & CMU_CALCTRL_DOWNSEL_MASK)
 #define CMU_CALCTRL_DOWNSEL_HFCLK	CMU_CALCTRL_DOWNSEL(0)
@@ -305,7 +305,7 @@
 #define CMU_CALCTRL_DOWNSEL_AUXHFRCO	CMU_CALCTRL_DOWNSEL(5)
 
 #define CMU_CALCTRL_UPSEL_SHIFT		(3)
-#define CMU_CALCTRL_UPSEL_MASK		(0x3 << CMU_CALCTRL_UPSEL_SHIFT)
+#define CMU_CALCTRL_UPSEL_MASK		(0x7 << CMU_CALCTRL_UPSEL_SHIFT)
 #define CMU_CALCTRL_UPSEL(v)		\
 	(((v) << CMU_CALCTRL_UPSEL_SHIFT) & CMU_CALCTRL_UPSEL_MASK)
 #define CMU_CALCTRL_UPSEL_HFXO		CMU_CALCTRL_UPSEL(0)
@@ -345,7 +345,7 @@
 #define CMU_CMD_CALSTART	(1 << 3)
 
 #define CMU_CMD_HFCLKSEL_SHIFT	(0)
-#define CMU_CMD_HFCLKSEL_MASK	(0x3 << CMU_CMD_HFCLKSEL_SHIFT)
+#define CMU_CMD_HFCLKSEL_MASK	(0x7 << CMU_CMD_HFCLKSEL_SHIFT)
 #define CMU_CMD_HFCLKSEL(v)	\
 	(((v) << CMU_CMD_HFCLKSEL_SHIFT) & CMU_CMD_HFCLKSEL_MASK)
 #define CMU_CMD_HFCLKSEL_HFRCO	CMU_CMD_HFCLKSEL(1)
@@ -591,7 +591,7 @@
 
 /* CMU_ROUTE */
 #define CMU_ROUTE_LOCATION_SHIFT	(2)
-#define CMU_ROUTE_LOCATION_MASK		(0x3 << CMU_ROUTE_LOCATION_SHIFT)
+#define CMU_ROUTE_LOCATION_MASK		(0x7 << CMU_ROUTE_LOCATION_SHIFT)
 #define CMU_ROUTE_LOCATION_LOCx(i)	\
 	(((i) << CMU_ROUTE_LOCATION_SHIFT) & CMU_ROUTE_LOCATION_MASK)
 #define CMU_ROUTE_LOCATION_LOC0		CMU_ROUTE_LOCATION_LOCx(0)
diff --git a/include/libopencm3/efm32/lg/gpio.h b/include/libopencm3/efm32/lg/gpio.h
index b90ca2c0..070a201f 100644
--- a/include/libopencm3/efm32/lg/gpio.h
+++ b/include/libopencm3/efm32/lg/gpio.h
@@ -43,10 +43,10 @@
 #define GPIO_P_CTRL_DRIVEMODE_MASK	(0x03 << GPIO_P_CTRL_DRIVEMODE_SHIFT)
 #define GPIO_P_CTRL_DRIVEMODE(v)	\
 	(((v) << GPIO_P_CTRL_DRIVEMODE_SHIFT) & GPIO_P_CTRL_DRIVEMODE_MASK)
-#define GPIO_P_CTRL_DRIVEMODE_STANDARD	GPIO_P_CTRL_DRIVEMODE_MASK(0)
-#define GPIO_P_CTRL_DRIVEMODE_LOWEST	GPIO_P_CTRL_DRIVEMODE_MASK(1)
-#define GPIO_P_CTRL_DRIVEMODE_HIGH	GPIO_P_CTRL_DRIVEMODE_MASK(2)
-#define GPIO_P_CTRL_DRIVEMODE_LOW	GPIO_P_CTRL_DRIVEMODE_MASK(3)
+#define GPIO_P_CTRL_DRIVEMODE_STANDARD	GPIO_P_CTRL_DRIVEMODE(0)
+#define GPIO_P_CTRL_DRIVEMODE_LOWEST	GPIO_P_CTRL_DRIVEMODE(1)
+#define GPIO_P_CTRL_DRIVEMODE_HIGH	GPIO_P_CTRL_DRIVEMODE(2)
+#define GPIO_P_CTRL_DRIVEMODE_LOW	GPIO_P_CTRL_DRIVEMODE(3)
 
 /* NOTE: GPIO_MODE and GPIO_MODE_MASK is generic.
  * it is used with both GPIO_Px_MODEL and GPIO_Px_MODEH */