summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--power/cometlake.c9
-rw-r--r--power/cometlake.h3
2 files changed, 7 insertions, 5 deletions
diff --git a/power/cometlake.c b/power/cometlake.c
index 0c6a8243f1..ec0052ff85 100644
--- a/power/cometlake.c
+++ b/power/cometlake.c
@@ -93,10 +93,11 @@ void chipset_pre_init_callback(void)
/* Turn on A (except PP5000_A) rails*/
gpio_set_level(GPIO_EN_A_RAILS, 1);
- /* Ensure that PP5000_A rail is stable */
- while (!gpio_get_level(GPIO_PP5000_A_PG_OD))
- ;
-
+ /*
+ * The status of the 5000_A rail is verifed in the calling function via
+ * power_wait_signals() as PP5000_A_PGOOD is included in the
+ * CHIPSET_G3S5_POWERUP_SIGNAL macro.
+ */
}
enum power_state power_handle_state(enum power_state state)
diff --git a/power/cometlake.h b/power/cometlake.h
index e3be31bdfb..c40562da17 100644
--- a/power/cometlake.h
+++ b/power/cometlake.h
@@ -20,7 +20,8 @@
#define IN_ALL_S0 (IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED | \
PP5000_PGOOD_POWER_SIGNAL_MASK)
-#define CHIPSET_G3S5_POWERUP_SIGNAL POWER_SIGNAL_MASK(X86_RSMRST_L_PGOOD)
+#define CHIPSET_G3S5_POWERUP_SIGNAL (POWER_SIGNAL_MASK(X86_RSMRST_L_PGOOD) | \
+ POWER_SIGNAL_MASK(PP5000_A_PGOOD))
#define CHARGER_INITIALIZED_DELAY_MS 100
#define CHARGER_INITIALIZED_TRIES 40