summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2015-10-08 09:08:26 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-10-12 13:15:47 -0700
commite337adc6e92e55a4c1591b99a8b7b393b3b40f48 (patch)
tree54189bfe0f7a8cae13b6f9d645aec84a5b1f383f /power
parentc682beaacfaaab41e942748deb19326a5700fe2c (diff)
downloadchrome-ec-e337adc6e92e55a4c1591b99a8b7b393b3b40f48.tar.gz
skylake: Move USB enable gpio control to board hooks
Some boards may not have a USB2_ENABLE GPIO so we need each board to do the USB power enable/disable in a board hook. BUG=chrome-os-partner:46289 BRANCH=none TEST=make -j buildall Change-Id: I830cbaf41c118b2f74e23fa946a4187f6293a7d5 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/304397 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/skylake.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/power/skylake.c b/power/skylake.c
index 6ef1e85cfc..1aa25d6bb6 100644
--- a/power/skylake.c
+++ b/power/skylake.c
@@ -207,10 +207,6 @@ static enum power_state _power_handle_state(enum power_state state)
return POWER_S5G3;
}
- /* Enable USB so that it can wake the system */
- gpio_set_level(GPIO_USB1_ENABLE, 1);
- gpio_set_level(GPIO_USB2_ENABLE, 1);
-
/* Call hooks now that rails are up */
hook_notify(HOOK_CHIPSET_STARTUP);
return POWER_S3;
@@ -268,9 +264,6 @@ static enum power_state _power_handle_state(enum power_state state)
/* Disable wireless */
wireless_set_state(WIRELESS_OFF);
- gpio_set_level(GPIO_USB1_ENABLE, 0);
- gpio_set_level(GPIO_USB2_ENABLE, 0);
-
/* Always enter into S5 state. The S5 state is required to
* correctly handle global resets which have a bit of delay
* while the SLP_Sx_L signals are asserted then deasserted. */