summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-08-08 11:26:49 -0700
committerRandall Spangler <rspangler@chromium.org>2013-08-09 17:50:31 -0700
commit9f8c3d7323239d82140633374971d9b143bc5ca7 (patch)
tree12128b68ff9da961a8007abfbe7454ce8d15b65b
parent86ff5d77c799e6a78e413fc5b451ebbc91c1fbbe (diff)
downloadchrome-ec-9f8c3d7323239d82140633374971d9b143bc5ca7.tar.gz
pit: leave 1.35V rail on during warm reboot
This maintains the contents of AP RAM during the warm reboot. BUG=chrome-os-partner:21483 BRANCH=pit TEST=from u-boot prompt, Peach # mm 41f00000 41f00000: 00000000 ? 9 41f00004: 00000000 ? 9 41f00008: 00000000 ? 9 41f0000c: 00000000 ? 9 41f00010: 00000000 ? 9 41f00014: 00000000 ? 9 41f00018: 00000000 ? 9 41f0001c: 00000000 ? 9 41f00020: 00000000 ? 9 41f00024: 00000000 ? 9 41f00028: 00000000 ? 9 41f0002c: 00000000 ? 9 41f00030: 00000000 ? 9 41f00034: 00004000 ? 9 41f00038: 00000000 ? 9 41f0003c: 00000000 ? 9 41f00040: 00000000 ? . Peach # md 41f00000 41f00000: 00000009 00000009 00000009 00000009 ................ 41f00010: 00000009 00000009 00000009 00000009 ................ 41f00020: 00000009 00000009 00000009 00000009 ................ 41f00030: 00000009 00000009 00000009 00000009 ................ Then Alt+VolUp+R. Then repeat md command at u-boot prompt. Orig-Change-Id: I07de4df2fe4c4dd86b88bbd208e1fb87860fa9d5 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/65227 Reviewed-by: Julius Werner <jwerner@chromium.org> (cherry picked from commit 100cace7abf24ac71581dd5d42286ca653b4c93c) Conflicts: common/chipset_gaia.c Change-Id: I653363dd327b8daf5ae2b2f838a52791740ef06d Reviewed-on: https://gerrit.chromium.org/gerrit/65423 Commit-Queue: Randall Spangler <rspangler@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--common/chipset_gaia.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/common/chipset_gaia.c b/common/chipset_gaia.c
index de773f30ce..6dcc95935c 100644
--- a/common/chipset_gaia.c
+++ b/common/chipset_gaia.c
@@ -343,7 +343,15 @@ void chipset_force_shutdown(void)
{
/* Turn off all rails */
gpio_set_level(GPIO_EN_PP3300, 0);
- gpio_set_level(GPIO_EN_PP1350, 0);
+
+ /*
+ * Turn off PP1350 unless we're immediately waking back up. This
+ * works with the hack in chipset_reset() to preserve the contents of
+ * RAM across a reset.
+ */
+ if (power_request != POWER_REQ_ON)
+ gpio_set_level(GPIO_EN_PP1350, 0);
+
set_pmic_pwrok(0);
gpio_set_level(GPIO_EN_PP5000, 0);
}