summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/chipset_haswell.c2
-rw-r--r--common/chipset_ivybridge.c2
-rw-r--r--include/ec_commands.h9
3 files changed, 7 insertions, 6 deletions
diff --git a/common/chipset_haswell.c b/common/chipset_haswell.c
index 4b58c1ff10..4e142a3e13 100644
--- a/common/chipset_haswell.c
+++ b/common/chipset_haswell.c
@@ -243,7 +243,7 @@ enum x86_state x86_handle_state(enum x86_state state)
gpio_set_level(GPIO_PP3300_DX_EN, 1);
/* Enable wireless */
- wireless_enable(1);
+ wireless_enable(EC_WIRELESS_SWITCH_ALL);
/* Wait for non-core power rails good */
if (x86_wait_signals(IN_PGOOD_S0)) {
diff --git a/common/chipset_ivybridge.c b/common/chipset_ivybridge.c
index 176e68108f..048d6a5d5b 100644
--- a/common/chipset_ivybridge.c
+++ b/common/chipset_ivybridge.c
@@ -239,7 +239,7 @@ enum x86_state x86_handle_state(enum x86_state state)
gpio_set_level(GPIO_ENABLE_VS, 1);
/* Enable wireless */
- wireless_enable(1);
+ wireless_enable(EC_WIRELESS_SWITCH_ALL);
/*
* Make sure touchscreen is out if reset (even if the lid is
diff --git a/include/ec_commands.h b/include/ec_commands.h
index 76e02bbf6e..c4ac2b5721 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -143,10 +143,11 @@
#define EC_HOST_CMD_FLAG_VERSION_3 0x02
/* Wireless switch flags */
-#define EC_WIRELESS_SWITCH_WLAN 0x01 /* WLAN radio */
-#define EC_WIRELESS_SWITCH_BLUETOOTH 0x02 /* Bluetooth radio */
-#define EC_WIRELESS_SWITCH_WWAN 0x04 /* WWAN power */
-#define EC_WIRELESS_SWITCH_WLAN_POWER 0x08 /* WLAN power */
+#define EC_WIRELESS_SWITCH_ALL ~0x00 /* All flags */
+#define EC_WIRELESS_SWITCH_WLAN 0x01 /* WLAN radio */
+#define EC_WIRELESS_SWITCH_BLUETOOTH 0x02 /* Bluetooth radio */
+#define EC_WIRELESS_SWITCH_WWAN 0x04 /* WWAN power */
+#define EC_WIRELESS_SWITCH_WLAN_POWER 0x08 /* WLAN power */
/*
* This header file is used in coreboot both in C and ACPI code. The ACPI code