diff options
Diffstat (limited to 'power/baytrail.c')
| -rw-r--r-- | power/baytrail.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/power/baytrail.c b/power/baytrail.c index 2d4aba1a36..b44e1b8e27 100644 --- a/power/baytrail.c +++ b/power/baytrail.c @@ -129,7 +129,7 @@ enum power_state power_chipset_init(void) gpio_set_level(GPIO_PP5000_EN, 0); gpio_set_level(GPIO_PCH_RSMRST_L, 0); gpio_set_level(GPIO_PCH_SYS_PWROK, 0); - wireless_enable(0); + wireless_set_state(WIRELESS_OFF); } } @@ -233,7 +233,7 @@ enum power_state power_handle_state(enum power_state state) gpio_set_level(GPIO_PP3300_DX_EN, 1); /* Enable wireless */ - wireless_enable(EC_WIRELESS_SWITCH_ALL); + wireless_set_state(WIRELESS_ON); /* * Make sure touchscreen is out if reset (even if the lid is @@ -245,7 +245,7 @@ enum power_state power_handle_state(enum power_state state) /* Wait for non-core power rails good */ if (power_wait_signals(IN_PGOOD_S0)) { chipset_force_shutdown(); - wireless_enable(0); + wireless_set_state(WIRELESS_OFF); gpio_set_level(GPIO_PP3300_DX_EN, 0); gpio_set_level(GPIO_PP5000_EN, 0); gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0); @@ -298,14 +298,8 @@ enum power_state power_handle_state(enum power_state state) /* Disable +CPU_CORE */ gpio_set_level(GPIO_VCORE_EN, 0); -#ifdef CONFIG_WIRELESS_SUSPEND_ENABLE_WIFI - /* Disable WWAN, but leave WiFi on */ - wireless_enable(EC_WIRELESS_SWITCH_WLAN | - EC_WIRELESS_SWITCH_WLAN_POWER); -#else - /* Disable wireless */ - wireless_enable(0); -#endif + /* Suspend wireless */ + wireless_set_state(WIRELESS_SUSPEND); /* * Enable idle task deep sleep. Allow the low power idle task @@ -343,7 +337,7 @@ enum power_state power_handle_state(enum power_state state) gpio_set_level(GPIO_PP5000_EN, 0); /* Disable wireless */ - wireless_enable(0); + wireless_set_state(WIRELESS_OFF); /* Disable touchpad power and hold touchscreen in reset */ gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0); |