From fc1fda072536cba977137a4f072b2705efb8074d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 24 Feb 2023 09:43:49 -0700 Subject: [PATCH] Use EC_RSMRST# for S5 detection on eSPI systems as well --- src/board/system76/common/power.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power.c index e6b434d..357c53d 100644 --- a/src/board/system76/common/power.c +++ b/src/board/system76/common/power.c @@ -119,8 +119,6 @@ extern uint8_t main_cycle; enum PowerState power_state = POWER_STATE_OFF; enum PowerState calculate_power_state(void) { - //TODO: Deep Sx states using SLP_SUS# - #if CONFIG_BUS_ESPI // Use eSPI virtual wires if available @@ -133,11 +131,6 @@ enum PowerState calculate_power_state(void) { // S4 and S5 planes powered return POWER_STATE_S3; } - - if (vw_get(&VW_SLP_S5_N) == VWS_HIGH) { - // S5 plane powered - return POWER_STATE_S5; - } #else // CONFIG_BUS_ESPI // Use dedicated GPIOs if not using ESPI @@ -150,12 +143,12 @@ enum PowerState calculate_power_state(void) { // S4 and S5 planes powered return POWER_STATE_S3; } +#endif // CONFIG_BUS_ESPI if (gpio_get(&EC_RSMRST_N)) { // S5 plane powered return POWER_STATE_S5; } -#endif // CONFIG_BUS_ESPI return POWER_STATE_OFF; }