diff options
| author | ChromeOS Developer <dparker@chromium.org> | 2014-02-11 16:39:35 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-02-12 20:02:20 +0000 |
| commit | 220b0b31ca6a8b36e0756dd1c98083a3dd7a1956 (patch) | |
| tree | 8163272596f0c836fc8f466039545809359e45a5 | |
| parent | 81abeb6135cabeb2325e4acc5d694f4c2942f899 (diff) | |
| download | chrome-ec-220b0b31ca6a8b36e0756dd1c98083a3dd7a1956.tar.gz | |
Reapply "Changed Wolf to use low power idle."
This reverts commit 45252efae14f2e42ec964838ce025385341beffc.
BUG=chrome-os-partner:25661
BRANCH=None
TEST=make BOARD=wolf -j
Signed-off-by: Dave Parker <dparker@chromium.org>
Conflicts:
board/wolf/board.h
Change-Id: Ie63c0cbdceb6a60ec2fbcc2269ea634f7ef51a6a
Reviewed-on: https://chromium-review.googlesource.com/186013
Reviewed-by: Dave Parker <dparker@chromium.org>
Commit-Queue: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | board/wolf/board.c | 10 | ||||
| -rw-r--r-- | board/wolf/board.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/board/wolf/board.c b/board/wolf/board.c index fa81cf5137..1c16282653 100644 --- a/board/wolf/board.c +++ b/board/wolf/board.c @@ -30,19 +30,19 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"POWER_BUTTON_L", LM4_GPIO_A, (1<<2), GPIO_INT_BOTH, + {"POWER_BUTTON_L", LM4_GPIO_A, (1<<2), GPIO_INT_BOTH_DSLEEP, power_button_interrupt}, - {"LID_OPEN", LM4_GPIO_A, (1<<3), GPIO_INT_BOTH, + {"LID_OPEN", LM4_GPIO_A, (1<<3), GPIO_INT_BOTH_DSLEEP, lid_interrupt}, - {"AC_PRESENT", LM4_GPIO_H, (1<<3), GPIO_INT_BOTH, + {"AC_PRESENT", LM4_GPIO_H, (1<<3), GPIO_INT_BOTH_DSLEEP, extpower_interrupt}, {"PCH_BKLTEN", LM4_GPIO_M, (1<<3), GPIO_INT_BOTH, backlight_interrupt}, {"PCH_SLP_S0_L", LM4_GPIO_G, (1<<6), GPIO_INT_BOTH, x86_interrupt}, - {"PCH_SLP_S3_L", LM4_GPIO_G, (1<<7), GPIO_INT_BOTH, + {"PCH_SLP_S3_L", LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP, x86_interrupt}, - {"PCH_SLP_S5_L", LM4_GPIO_H, (1<<1), GPIO_INT_BOTH, + {"PCH_SLP_S5_L", LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP, x86_interrupt}, {"PCH_SLP_SUS_L", LM4_GPIO_G, (1<<3), GPIO_INT_BOTH, x86_interrupt}, diff --git a/board/wolf/board.h b/board/wolf/board.h index 682c70614d..fea7c4451e 100644 --- a/board/wolf/board.h +++ b/board/wolf/board.h @@ -22,6 +22,7 @@ #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_PECI_TJMAX 100 +#define CONFIG_LOW_POWER_IDLE #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 #define CONFIG_PWM_FAN |