diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2013-07-16 07:50:32 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-16 09:50:27 -0700 |
| commit | af98de723678de946b8b7b324af0941c9aabe2d6 (patch) | |
| tree | 09c3915df38b606731b2f4fcb6d3ab5340303378 | |
| parent | 396cb8e69e11bd474864d203b2f67cb95e7ae0e5 (diff) | |
| download | chrome-ec-af98de723678de946b8b7b324af0941c9aabe2d6.tar.gz | |
x86: Enable all wireless switches when going into S0v1.5.0
BUG=None
BRANCH=slippy,peppy,falco,wolf
TEST=Boot device and verify WLAN and WWAN enable GPIOs are active.
Original-Change-Id: I1b488bc26ddbe50c570aefd8fcd3cdcb4d5b38d4
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/61653
Commit-Queue: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
(cherry picked from commit 92b62d1cd934b21ee86594295e3a13a45c6fa79e)
Change-Id: I675c1bc6494c183177ded59673c64ab71cbdda14
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/62100
| -rw-r--r-- | common/chipset_haswell.c | 2 | ||||
| -rw-r--r-- | common/chipset_ivybridge.c | 2 | ||||
| -rw-r--r-- | include/ec_commands.h | 9 |
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 |