diff options
| -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: |