diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2017-12-05 16:06:22 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-06 17:30:46 -0800 |
| commit | eab8143d0baca0e85d9b76fc28326e3dcba2c9e9 (patch) | |
| tree | 496279bcbdfa03e712af8aee9710670d759da101 | |
| parent | eff4baf03f28f04cf1e89a602fe3a244228cbb6e (diff) | |
| download | chrome-ec-eab8143d0baca0e85d9b76fc28326e3dcba2c9e9.tar.gz | |
meowth: zoombini: Add volume buttons.
BUG=b:69140339,b:70255560
BRANCH=None
TEST=make -j buildall.
TEST=Flash zoombini; Press volume buttons. Verify that button presses
are registered on the EC console.
Change-Id: Idd0b307ce1262340a0c963ca7eca1efe9f052b50
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/810105
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | board/zoombini/board.c | 1 | ||||
| -rw-r--r-- | board/zoombini/board.h | 1 | ||||
| -rw-r--r-- | board/zoombini/gpio.inc | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/board/zoombini/board.c b/board/zoombini/board.c index 27a361eae3..d0eae53784 100644 --- a/board/zoombini/board.c +++ b/board/zoombini/board.c @@ -6,6 +6,7 @@ /* Zoombini board-specific configuration */ #include "adc_chip.h" +#include "button.h" #include "charge_manager.h" #include "charge_state.h" #include "charge_state_v2.h" diff --git a/board/zoombini/board.h b/board/zoombini/board.h index 37ca260ca0..4e79ececc4 100644 --- a/board/zoombini/board.h +++ b/board/zoombini/board.h @@ -102,6 +102,7 @@ #define CONFIG_USBC_VCONN_SWAP #define CONFIG_VBOOT_HASH +#define CONFIG_VOLUME_BUTTONS #ifdef BOARD_ZOOMBINI /* USB Type-A Port BC1.2 support */ diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc index 97b2cd6db5..c6691f8c6b 100644 --- a/board/zoombini/gpio.inc +++ b/board/zoombini/gpio.inc @@ -31,6 +31,8 @@ GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_DPWROK, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_INT_L, PIN(D, 5), GPIO_INT_FALLING | GPIO_PULL_UP, power_signal_interrupt) GPIO_INT(PP5000_PGOOD, PIN(C, 0), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_DOWN_L, PIN(4, 1), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Power Enables. */ GPIO(EN_PP3300_DSW, PIN(6, 0), GPIO_OUT_HIGH) @@ -139,6 +141,8 @@ GPIO_INT(PCH_SLP_SUS_L, PIN(D, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signa GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_DPWROK, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_INT_L, PIN(D, 5), GPIO_INT_FALLING | GPIO_PULL_UP, power_signal_interrupt) +GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_DOWN_L, PIN(6, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Power Enables. */ GPIO(EN_PP3300_DSW, PIN(8, 2), GPIO_OUT_HIGH) |