diff options
author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-01-07 11:30:45 -0800 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-09 05:30:49 +0000 |
commit | 9867f8379a09d60b3df8c62c269627714e97b2ac (patch) | |
tree | d9fb36a41b576fc4766a68b48a76c4e7b0a2724c /board/nyan | |
parent | 28de8c96b92815139d8589a5c2cf145c4a5785ee (diff) | |
download | chrome-ec-9867f8379a09d60b3df8c62c269627714e97b2ac.tar.gz |
x86: generalize power state machine for all platforms (2/2)
Rename x86_* to power_signal_* and X86_* to POWER_*.
BUG=chrome-os-partner:24832
BRANCH=link,falco,samus,rambi,peppy,squawks,snow,spring,nyan
TEST=make -j buildall run_tests
Change-Id: Ifaa06391da5a483851ff56eca91fbf6d038dff0a
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181719
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board/nyan')
-rw-r--r-- | board/nyan/board.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/board/nyan/board.c b/board/nyan/board.c index 060b9a40e1..0daa122fe9 100644 --- a/board/nyan/board.c +++ b/board/nyan/board.c @@ -14,6 +14,7 @@ #include "lid_switch.h" #include "pmu_tpschrome.h" #include "power_button.h" +#include "power.h" #include "pwm.h" #include "pwm_chip.h" #include "registers.h" @@ -30,9 +31,11 @@ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ {"POWER_BUTTON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_button_interrupt}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, + power_signal_interrupt}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, power_interrupt}, + {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, + power_signal_interrupt}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, {"AC_PRESENT", GPIO_A, (1<<0), GPIO_INT_BOTH, extpower_interrupt}, |