diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-07-15 17:13:22 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-16 05:15:29 +0000 |
| commit | 78016324acf20e06abebd9b82a9a88b1eed2bdf6 (patch) | |
| tree | fb09f9d63c2bfdce77b45fe3dd49128a43217ae4 /board/strago | |
| parent | e7bebf7c805e160bfd633da5c8357527a4fee9f6 (diff) | |
| download | chrome-ec-78016324acf20e06abebd9b82a9a88b1eed2bdf6.tar.gz | |
mec1322: Allow multiple hibernate wake sources
Allow multiple GPIOs to wake the EC from hibernate by requiring boards
to define hibernate_wake_pins and hibernate_wake_pins_used. In addition,
clean up the GPIO-skipping hibernate code, and skip setting PCH_RTCRST
as an input due to a bug on certain boards.
BUG=chrome-os-partner:42104
TEST=Manual on Glados. Run 'hibernate' from EC console, verify that EC
wakes with power button press or with "dut-control lid_open:no".
BRANCH=None
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I13a6e062393cab8ed7129eda253585951f771109
Reviewed-on: https://chromium-review.googlesource.com/285924
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'board/strago')
| -rw-r--r-- | board/strago/board.c | 5 | ||||
| -rw-r--r-- | board/strago/board.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/board/strago/board.c b/board/strago/board.c index ac5a8a5c7f..8dd5c0e1d9 100644 --- a/board/strago/board.c +++ b/board/strago/board.c @@ -65,6 +65,11 @@ const struct i2c_port_t i2c_ports[] = { }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); +const enum gpio_signal hibernate_wake_pins[] = { +}; + +const int hibernate_wake_pins_used; + /* * Temperature sensors data; must be in same order as enum temp_sensor_id. * Sensor index and name must match those present in coreboot: diff --git a/board/strago/board.h b/board/strago/board.h index cf5132a61c..9225b38c17 100644 --- a/board/strago/board.h +++ b/board/strago/board.h @@ -77,7 +77,6 @@ #undef CONFIG_PECI #undef CONFIG_FANS #undef CONFIG_ADC -#undef CONFIG_WAKE_PIN #ifndef __ASSEMBLER__ #include "gpio_signal.h" |