summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorVijay Hiremath <vijay.p.hiremath@intel.com>2016-08-22 16:15:59 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-08-24 02:15:09 -0700
commitf322e32a3ec052be3f0c226145448fed63aa7ef9 (patch)
tree0baf8f4e3bb04016413cefbd30a502fd6a2c3874 /power
parent748b5bad9fb17d13c89d3e446bd6ef3a4ec55e59 (diff)
downloadchrome-ec-f322e32a3ec052be3f0c226145448fed63aa7ef9.tar.gz
apollolake: Do not power-on AP till sufficient power is provided
Do not power-on the AP unless battery can provide sufficient power or the charger is negotiated to sufficient power. BUG=chrome-os-partner:56494 BRANCH=none TEST=Manually tested on Reef. Device can boot to OS without the battery & cut-off battery. Change-Id: Ib22bad81a29ccbb2fecc8e835148b627dd722988 Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com> Reviewed-on: https://chromium-review.googlesource.com/374023 Commit-Ready: Vijay P Hiremath <vijay.p.hiremath@intel.com> Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/apollolake.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/power/apollolake.c b/power/apollolake.c
index c477064c8d..3710579c3e 100644
--- a/power/apollolake.c
+++ b/power/apollolake.c
@@ -256,9 +256,6 @@ static enum power_state _power_handle_state(enum power_state state)
/* Platform is powering up, clear forcing_coldreset */
forcing_coldreset = 0;
- /* Call hooks to initialize PMIC */
- hook_notify(HOOK_CHIPSET_PRE_INIT);
-
/*
* Allow up to 1s for charger to be initialized, in case
* we're trying to boot the AP with no battery.
@@ -276,6 +273,9 @@ static enum power_state _power_handle_state(enum power_state state)
return POWER_G3;
}
+ /* Call hooks to initialize PMIC */
+ hook_notify(HOOK_CHIPSET_PRE_INIT);
+
/* Wait for RSMRST_L de-assert */
if (power_wait_signals(IN_PGOOD_ALL_CORE)) {
chipset_force_shutdown();