diff options
| author | Scott Collyer <scollyer@google.com> | 2018-09-25 11:27:45 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-09-26 10:33:25 -0700 |
| commit | 80769acb65ddf155170b3d119fd88ec0623e68ed (patch) | |
| tree | 1231f905d60918f35cdc936095ac99451a641885 /board/dragonegg | |
| parent | c042e22956acee71393205e38eae8b8f72458925 (diff) | |
| download | chrome-ec-80769acb65ddf155170b3d119fd88ec0623e68ed.tar.gz | |
DragonEgg: Add support for volume buttons
This feature wasn't added in the initial image.
BUG=b:112623232
BRANCH=none
TEST=Tested on DragonEgg.
Event: time 1537835576.258487, type 4 (EV_MSC), code 4 (MSC_SCAN), value
Event: time 1537835576.258487, type 1 (EV_KEY), code 115 (KEY_VOLUMEUP),
Event: time 1537835583.549410, type 4 (EV_MSC), code 4 (MSC_SCAN), value
Event: time 1537835583.549410, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN),
Change-Id: Ic4650ac1388a2ee4c5f4c47918051f3f4b1e305d
Signed-off-by: Scott Collyer <scollyer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1244056
Commit-Ready: Scott Collyer <scollyer@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'board/dragonegg')
| -rw-r--r-- | board/dragonegg/board.c | 1 | ||||
| -rw-r--r-- | board/dragonegg/board.h | 1 | ||||
| -rw-r--r-- | board/dragonegg/gpio.inc | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/board/dragonegg/board.c b/board/dragonegg/board.c index ccff76debf..9bd3fadf87 100644 --- a/board/dragonegg/board.c +++ b/board/dragonegg/board.c @@ -6,6 +6,7 @@ /* DragonEgg board-specific configuration */ #include "adc.h" #include "adc_chip.h" +#include "button.h" #include "common.h" #include "charger.h" #include "console.h" diff --git a/board/dragonegg/board.h b/board/dragonegg/board.h index 6f0baf50a3..75222afc0e 100644 --- a/board/dragonegg/board.h +++ b/board/dragonegg/board.h @@ -20,6 +20,7 @@ /* Keyboard features */ #define CONFIG_PWM_KBLIGHT +#define CONFIG_VOLUME_BUTTONS /* USB and USBC features */ #define CONFIG_USB_PORT_POWER_SMART diff --git a/board/dragonegg/gpio.inc b/board/dragonegg/gpio.inc index ab1c7652be..3faab500be 100644 --- a/board/dragonegg/gpio.inc +++ b/board/dragonegg/gpio.inc @@ -34,9 +34,8 @@ GPIO_INT(USB_C2_TCPPC_INT_ODL, PIN(L, 1), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C2_TCPC_INT_ODL, PIN(K, 6), GPIO_INT_FALLING, tcpc_alert_event) /* Misc. interrupts */ -/* TODO (b:110880394) Uncomment this when support for buttons is added */ -/* GPIO_INT(VOL_DOWN_ODL, PIN(I, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) */ -/* GPIO_INT(VOL_UP_ODL, PIN(I, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) */ +GPIO_INT(VOLUME_DOWN_L, PIN(I, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_UP_L, PIN(I, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* TODO (b:110947310) Uncomment this when sensor task is added to image */ /* GPIO_INT(BASE_SIXAXIS_INT_L, PIN(J, 0), GPIO_INT_FALLING | GPIO_SEL_1P8V, lsm6dsm_interrupt) */ |