summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--power/skylake.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/power/skylake.c b/power/skylake.c
index bce0069472..31b6c61944 100644
--- a/power/skylake.c
+++ b/power/skylake.c
@@ -47,14 +47,12 @@ void chipset_force_shutdown(void)
* Force off. This condition will reset once the state machine
* transitions to G3.
*/
- gpio_set_level(GPIO_PCH_RSMRST_L, 0);
}
void chipset_force_g3(void)
{
CPRINTS("Forcing G3");
- gpio_set_level(GPIO_PCH_RSMRST_L, 0);
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);
@@ -115,6 +113,8 @@ enum power_state power_chipset_init(void)
enum power_state power_handle_state(enum power_state state)
{
+ gpio_set_level(GPIO_PCH_RSMRST_L, gpio_get_level(GPIO_RSMRST_L_PGOOD));
+
switch (state) {
case POWER_G3:
break;
@@ -154,9 +154,6 @@ enum power_state power_handle_state(enum power_state state)
return POWER_G3;
}
- /* Deassert RSMRST# */
- gpio_set_level(GPIO_PCH_RSMRST_L, 1);
-
return POWER_S5;
case POWER_S5S3:
@@ -235,7 +232,6 @@ enum power_state power_handle_state(enum power_state state)
return POWER_S5G3;
case POWER_S5G3:
- gpio_set_level(GPIO_PCH_RSMRST_L, 0);
return POWER_G3;
default: