diff options
| author | Gabe Black <gabeblack@google.com> | 2013-07-31 23:40:55 -0700 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2013-12-21 21:02:23 +0100 |
| commit | aa6061a0d0032065e210789c52af5d9b0a375ba9 (patch) | |
| tree | 3f9aec584c19d892b4f5540833f813cf5696b685 /src/mainboard/google | |
| parent | 925ad2efad9743e402d88fbc6344731e3f2c2ba3 (diff) | |
kirby: pit: Fix up wakeup_need_reset
In a previous commit the contents of wakeup_need_reset were removed because
the GPIO it referred to wasn't connected to anything on pit. I didn't realize
at that time that that could have been because we hadn't tried getting
suspend/resume working on pit and hadn't updated that file. On snow, the GPIO
is the recovery mode pin. This change updates pit to have the right GPIO,
kirby to read that GPIO, and makes the comments for both pit and kirby more
explicit and spells out the fact that this is the recovery mode GPIO.
Having a check here at all may still be a holdover from snow that isn't
applicable to pit or kirby, but since there is a parallel as far as the
recovery mode GPIO we might as well make them match while waiting for more
information.
Change-Id: Ic1f3f605a0fddf89e8f5668c7a8df30bdfb91d94
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/64164
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/4421
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/kirby/wakeup.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/pit/wakeup.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mainboard/google/kirby/wakeup.c b/src/mainboard/google/kirby/wakeup.c index 43bad6f4a5..02305b50d3 100644 --- a/src/mainboard/google/kirby/wakeup.c +++ b/src/mainboard/google/kirby/wakeup.c @@ -22,6 +22,8 @@ int wakeup_need_reset(void) { - return 0; + /* The "wake up" event is not reliable (known as "bad wakeup") and needs + * reset if the TPM reset mask GPIO value is high. */ + return gpio_get_value(GPIO_X06); } diff --git a/src/mainboard/google/pit/wakeup.c b/src/mainboard/google/pit/wakeup.c index a82b63299c..02305b50d3 100644 --- a/src/mainboard/google/pit/wakeup.c +++ b/src/mainboard/google/pit/wakeup.c @@ -23,7 +23,7 @@ int wakeup_need_reset(void) { /* The "wake up" event is not reliable (known as "bad wakeup") and needs - * reset if GPIO value is high. */ - return gpio_get_value(GPIO_Y10); + * reset if the TPM reset mask GPIO value is high. */ + return gpio_get_value(GPIO_X06); } |