diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-05-28 13:26:42 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-28 23:02:14 +0000 |
| commit | f863bd1b953696ed4b1629a84d1b0b99e37c294d (patch) | |
| tree | 7dec59bf8c18dd9e87dbfeec818d71aac2b886bd | |
| parent | 14dc6260612e3f0060a7a249cdbda9a73349c781 (diff) | |
| download | chrome-ec-f863bd1b953696ed4b1629a84d1b0b99e37c294d.tar.gz | |
power/skylake: Always enable PP*_EN signals for bring-up
Always enable these signals to help debug power sequencing. We'll need
to revert this change later.
BUG=chrome-os-partner:40677
BRANCH=none
TEST=sequence to S0 on glados and stay there
Change-Id: Ia845532fe7aed71bcb42b4ca6a9bfa20aa9e3e00
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/273900
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
| -rw-r--r-- | board/glados/gpio.inc | 6 | ||||
| -rw-r--r-- | power/skylake.c | 12 |
2 files changed, 3 insertions, 15 deletions
diff --git a/board/glados/gpio.inc b/board/glados/gpio.inc index 1fa58b5509..a03bb45faf 100644 --- a/board/glados/gpio.inc +++ b/board/glados/gpio.inc @@ -78,13 +78,13 @@ GPIO(USB_C0_5V_EN, PIN(154), GPIO_OUT_LOW) GPIO(USB_C1_5V_EN, PIN(204), GPIO_OUT_LOW) GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW) GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_LOW) -GPIO(PP1800_DX_SENSOR_EN, PIN(11), GPIO_OUT_LOW) -GPIO(PP1800_DX_AUDIO_EN, PIN(160), GPIO_OUT_LOW) +GPIO(PP1800_DX_SENSOR_EN, PIN(11), GPIO_OUT_HIGH) +GPIO(PP1800_DX_AUDIO_EN, PIN(160), GPIO_OUT_HIGH) GPIO(PCH_RTCRST_L, PIN(163), GPIO_ODR_HIGH) /* From lid sensor */ GPIO(TABLET_MODE, PIN(201), GPIO_INPUT) GPIO(ENABLE_BACKLIGHT, PIN(202), GPIO_OUT_HIGH) -GPIO(PP3300_WLAN_EN, PIN(203), GPIO_OUT_LOW) +GPIO(PP3300_WLAN_EN, PIN(203), GPIO_OUT_HIGH) GPIO(EC_WAKE_CLK, PIN(210), GPIO_INPUT) GPIO(BOARD_ID0, PIN(6), GPIO_INPUT) GPIO(BOARD_ID1, PIN(7), GPIO_INPUT) diff --git a/power/skylake.c b/power/skylake.c index 31b6c61944..c7352e9633 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -52,10 +52,6 @@ void chipset_force_shutdown(void) void chipset_force_g3(void) { CPRINTS("Forcing G3"); - - gpio_set_level(GPIO_PP1800_DX_SENSOR_EN, 0); - gpio_set_level(GPIO_PP1800_DX_AUDIO_EN, 0); - gpio_set_level(GPIO_PP3300_WLAN_EN, 0); } void chipset_reset(int cold_reset) @@ -177,10 +173,6 @@ enum power_state power_handle_state(enum power_state state) return POWER_S3S5; } - gpio_set_level(GPIO_PP1800_DX_SENSOR_EN, 1); - gpio_set_level(GPIO_PP1800_DX_AUDIO_EN, 1); - gpio_set_level(GPIO_PP3300_WLAN_EN, 1); - /* Enable wireless */ wireless_set_state(WIRELESS_ON); @@ -214,10 +206,6 @@ enum power_state power_handle_state(enum power_state state) */ enable_sleep(SLEEP_MASK_AP_RUN); - gpio_set_level(GPIO_PP1800_DX_SENSOR_EN, 0); - gpio_set_level(GPIO_PP1800_DX_AUDIO_EN, 0); - gpio_set_level(GPIO_PP3300_WLAN_EN, 0); - return POWER_S3; case POWER_S3S5: |