diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-10-06 09:25:20 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-10-06 22:57:21 -0700 |
| commit | 4253105dbf5420f6dec21a404cf9ee5fcf023b71 (patch) | |
| tree | b07db6131cfea29a6acb6e1cd96859d88bf38b35 | |
| parent | 0596b551dfd45dd4af2e8f7a0baad1141d25bfb8 (diff) | |
| download | chrome-ec-4253105dbf5420f6dec21a404cf9ee5fcf023b71.tar.gz | |
glados: Add support for volume buttons
BUG=chrome-os-partner:43521
BRANCH=None
TEST=Manual on Glados. Push and release volume up button, verify that
"Volume Up was pressed / released" is seen on EC console. Also verify
the same for volume down button.
Change-Id: Id53e445e832baa5e98e13a5d1a78f5f12d21666c
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/304076
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/glados/board.c | 6 | ||||
| -rw-r--r-- | board/glados/gpio.inc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/board/glados/board.c b/board/glados/board.c index bf26db6bcd..a86a25489b 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -214,8 +214,10 @@ struct als_t als[] = { BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); const struct button_config buttons[CONFIG_BUTTON_COUNT] = { - { 0 }, - { 0 }, + {"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN_L, + 30 * MSEC, 0}, + {"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_VOLUME_UP_L, + 30 * MSEC, 0}, }; static void board_pmic_init(void) diff --git a/board/glados/gpio.inc b/board/glados/gpio.inc index 47a3708f27..d507fcb505 100644 --- a/board/glados/gpio.inc +++ b/board/glados/gpio.inc @@ -22,8 +22,8 @@ GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH, power_signal_interrupt) */ GPIO_INT(PCH_SLP_S0_L, PIN(211), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_FALLING | GPIO_PULL_UP, button_interrupt) -GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_FALLING | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_PULL_UP, pd_mcu_interrupt) GPIO_INT(USB_C0_VBUS_WAKE_L,PIN(152), GPIO_INT_BOTH, vbus0_evt) |