diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2017-11-15 22:23:00 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-17 20:18:38 -0800 |
| commit | 34a97f50d5275f1fa2f1cb377683c96286b2421d (patch) | |
| tree | 2ea62dc537426fb252123fb93b3b4f05db5f1443 /board/glkrvp | |
| parent | f587852570770564e8a94b2c3f7ad7d97883c49a (diff) | |
| download | chrome-ec-34a97f50d5275f1fa2f1cb377683c96286b2421d.tar.gz | |
buttons: Make buttons[] common.
Nearly every board had a buttons array defined in which its contents had
the standard volume buttons. This commit creates a single common
buttons array that can contain the standard volume buttons and recovery
buttons. If a board has volume up and down buttons, they can simply
define CONFIG_VOLUME_BUTTONS and it will populate the buttons array with
the standard definition. The buttons are active low and have a 30 ms
debounce period. Similiarly, if a board has a dedicated recovery
button, defining CONFIG_DEDICATED_RECOVERY_BUTTON will also populate the
buttons array with a recovery button.
BUG=chromium:783371
BRANCH=None
TEST=make -j buildall.
TEST=Flash a device with CONFIG_VOLUME_BUTTONS, verify pressing volume
buttons still work.
Change-Id: Ie5d63670ca4c6b146ec8ffb64d40ea9ce437b913
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/773794
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board/glkrvp')
| -rw-r--r-- | board/glkrvp/board.c | 18 | ||||
| -rw-r--r-- | board/glkrvp/board.h | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/board/glkrvp/board.c b/board/glkrvp/board.c index 9c5f22eb58..1038811f60 100644 --- a/board/glkrvp/board.c +++ b/board/glkrvp/board.c @@ -74,24 +74,6 @@ const enum gpio_signal hibernate_wake_pins[] = { }; const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); -const struct button_config buttons[CONFIG_BUTTON_COUNT] = { - { - .name = "Volume Up", - .type = KEYBOARD_BUTTON_VOLUME_UP, - .gpio = GPIO_EC_VOLUP_BTN_ODL, - .debounce_us = 30 * MSEC, - .flags = 0, - }, - { - .name = "Volume Down", - .type = KEYBOARD_BUTTON_VOLUME_DOWN, - .gpio = GPIO_EC_VOLDN_BTN_ODL, - .debounce_us = 30 * MSEC, - .flags = 0, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT); - /* Called by APL power state machine when transitioning from G3 to S5 */ static void chipset_pre_init(void) { diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h index 3ff9fca52f..2115be6d3b 100644 --- a/board/glkrvp/board.h +++ b/board/glkrvp/board.h @@ -85,7 +85,9 @@ /* EC */ #define CONFIG_BOARD_VERSION #define CONFIG_BOARD_SPECIFIC_VERSION -#define CONFIG_BUTTON_COUNT 2 +#define CONFIG_VOLUME_BUTTONS +#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL +#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL #define CONFIG_WP_ALWAYS #define CONFIG_I2C #define CONFIG_I2C_MASTER |