diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-01-21 14:37:53 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-01-25 19:48:21 -0800 |
| commit | 8c9210b81e83c94d9d34497d202476c4fa6fb34b (patch) | |
| tree | 62736db763a94b69d81a4cd2a6f814fe72ba28ac /chip/mec1322/registers.h | |
| parent | f5e9dbe10688cea2d5426c96e3a8976efb22a8a7 (diff) | |
| download | chrome-ec-8c9210b81e83c94d9d34497d202476c4fa6fb34b.tar.gz | |
mec1322: hibernate: Don't reconfigure all GPIOs
Configuring all GPIOs to INPUT / PULL_UP in hibernate is not a good
idea:
- INPUT / PULL_UP is not necessarially the lowest-power state (for
example, if there is an onboard pull-down).
- Most GPIOs should already be in lowest-power state when we're in S5.
- For the few GPIOs that need to be in a different state for hibernate,
we can use a board-level callback.
In addition, remove mec1322 code related to restoring from hibernate
state, since we always reset coming out of hibernate.
BUG=chrome-os-partner:49608
BRANCH=glados, strago
TEST=`hibernate` on chell console when in S5 and AC removed. Verify that
EC power is roughly equivalent to low-power idle power. Attach Zinger,
verify that device wakes and boots, and charges from charger.
Change-Id: Ib00ef035bec32cea3847eb38d743f5c0cec896ca
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/322937
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>
Diffstat (limited to 'chip/mec1322/registers.h')
| -rw-r--r-- | chip/mec1322/registers.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chip/mec1322/registers.h b/chip/mec1322/registers.h index be2d5f4a90..b7a814cd8c 100644 --- a/chip/mec1322/registers.h +++ b/chip/mec1322/registers.h @@ -65,7 +65,6 @@ #define MEC1322_EC_WDT_CNT REG32(MEC1322_EC_BASE + 0x28) #define MEC1322_EC_ADC_VREF_PD REG32(MEC1322_EC_BASE + 0x38) - /* Interrupt aggregator */ #define MEC1322_INT_BASE 0x4000c000 #define MEC1322_INTx_BASE(x) (MEC1322_INT_BASE + ((x) - 8) * 0x14) @@ -498,11 +497,4 @@ typedef volatile struct mec1322_dma_regs mec1322_dma_regs_t; extern const enum gpio_signal hibernate_wake_pins[]; extern const int hibernate_wake_pins_used; -/* - * Optional board-level function to get hibernate GPIO state. - * Returns desired GPIO state in hibernate, or 0 to skip reconfiguration. - */ -uint32_t board_get_gpio_hibernate_state(uint32_t port, uint32_t pin) - __attribute__((weak)); - #endif /* __CROS_EC_REGISTERS_H */ |