diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2013-12-10 10:53:14 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-12-11 00:13:51 +0000 |
| commit | b38fd4500082e6f26a2a47ee7ddb1bd2a0f091c4 (patch) | |
| tree | 0c3eeac4f9f90f98842915ad6d00715312f01724 /board/nyan | |
| parent | 96e034f366eacc4bfaed87685d4536dae1e1b91c (diff) | |
| download | chrome-ec-b38fd4500082e6f26a2a47ee7ddb1bd2a0f091c4.tar.gz | |
nyan: re-factor power button to use common/power_button.c
This is the first step of tegra power state re-factoring. Move the
power button logic to common/power_button.c.
Also, the GPIO KB_PWR_ON_L is renamed to POWER_BUTTON_L.
BUG=None
BRANCH=nyan
TEST=tested on nyan rev 3.12,
reboot: PASS, power on 2
power off / power on: PASS, power on 5
lid close / power off / lid open: PASS, power on 3
button on / off: PASS, ending loop 3, power on 4
power off / button on: PASS, ending loop 4, power on 4
button off / power on: PASS, ending loop 3, power on 5
button off / lid open: PASS, ending loop 3, power on 3
Change-Id: If07806b9c11cdba2b478a9a74d2b75be1d9f7acf
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/179451
Diffstat (limited to 'board/nyan')
| -rw-r--r-- | board/nyan/board.c | 4 | ||||
| -rw-r--r-- | board/nyan/board.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/board/nyan/board.c b/board/nyan/board.c index 29c35045fc..6744d0d765 100644 --- a/board/nyan/board.c +++ b/board/nyan/board.c @@ -13,6 +13,7 @@ #include "keyboard_raw.h" #include "lid_switch.h" #include "pmu_tpschrome.h" +#include "power_button.h" #include "pwm.h" #include "pwm_chip.h" #include "registers.h" @@ -27,7 +28,8 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"POWER_BUTTON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, + power_button_interrupt}, {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, power_interrupt}, diff --git a/board/nyan/board.h b/board/nyan/board.h index 57483b20d0..e51960e07d 100644 --- a/board/nyan/board.h +++ b/board/nyan/board.h @@ -19,6 +19,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_SPI #define CONFIG_PWM +#define CONFIG_POWER_BUTTON #ifndef __ASSEMBLER__ @@ -39,7 +40,7 @@ /* GPIO signal list */ enum gpio_signal { /* Inputs with interrupt handlers are first for efficiency */ - GPIO_KB_PWR_ON_L = 0, + GPIO_POWER_BUTTON_L = 0, GPIO_SOC1V8_XPSHOLD, GPIO_LID_OPEN, GPIO_SUSPEND_L, |