summaryrefslogtreecommitdiff
path: root/power/intel_x86.c
diff options
context:
space:
mode:
Diffstat (limited to 'power/intel_x86.c')
-rw-r--r--power/intel_x86.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/power/intel_x86.c b/power/intel_x86.c
index ea0a8dc6c6..6c182344c4 100644
--- a/power/intel_x86.c
+++ b/power/intel_x86.c
@@ -277,14 +277,6 @@ enum power_state common_intel_x86_power_handle_state(enum power_state state)
}
#endif
- /* Call hooks to initialize PMIC */
- hook_notify(HOOK_CHIPSET_PRE_INIT);
-
- if (power_wait_signals(CHIPSET_G3S5_POWERUP_SIGNAL)) {
- chipset_force_shutdown();
- return POWER_G3;
- }
-
#ifdef CONFIG_VBOOT_EFS
/*
* We have to test power readiness here (instead of S5->S3)
@@ -292,11 +284,17 @@ enum power_state common_intel_x86_power_handle_state(enum power_state state)
* which causes (short-powered) system to brown out.
*/
while (!system_can_boot_ap())
- /* LED blinks as HOOK_TICK events trigger.
- * We can print percent & power as they
- * improve. */
msleep(200);
#endif
+
+ /* Call hooks to initialize PMIC */
+ hook_notify(HOOK_CHIPSET_PRE_INIT);
+
+ if (power_wait_signals(CHIPSET_G3S5_POWERUP_SIGNAL)) {
+ chipset_force_shutdown();
+ return POWER_G3;
+ }
+
power_s5_up = 1;
return POWER_S5;