summaryrefslogtreecommitdiff
path: root/board/host
diff options
context:
space:
mode:
Diffstat (limited to 'board/host')
-rw-r--r--board/host/board.c10
-rw-r--r--board/host/gpio.inc4
2 files changed, 2 insertions, 12 deletions
diff --git a/board/host/board.c b/board/host/board.c
index b29f6e9230..e3183fa874 100644
--- a/board/host/board.c
+++ b/board/host/board.c
@@ -45,16 +45,6 @@ test_mockable void button_interrupt(enum gpio_signal signal)
{
};
-#ifdef CONFIG_BUTTON_COUNT
-const struct button_config buttons[] = {
- {"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_BUTTON_VOLUME_DOWN_L,
- 30 * MSEC, 0},
- {"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_BUTTON_VOLUME_UP,
- 60 * MSEC, BUTTON_FLAG_ACTIVE_HIGH},
-};
-BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT);
-#endif
-
#ifdef CONFIG_I2C
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
diff --git a/board/host/gpio.inc b/board/host/gpio.inc
index 7695a6021d..73bd6c0252 100644
--- a/board/host/gpio.inc
+++ b/board/host/gpio.inc
@@ -11,8 +11,8 @@
GPIO_INT(LID_OPEN, PIN(0, 0), GPIO_INT_BOTH, lid_interrupt)
GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt)
GPIO_INT(AC_PRESENT, PIN(0, 2), GPIO_INT_BOTH, extpower_interrupt)
-GPIO_INT(BUTTON_VOLUME_DOWN_L, PIN(0, 3), GPIO_INT_BOTH, button_interrupt)
-GPIO_INT(BUTTON_VOLUME_UP, PIN(0, 4), GPIO_INT_BOTH, button_interrupt)
+GPIO_INT(VOLUME_DOWN_L, PIN(0, 3), GPIO_INT_BOTH, button_interrupt)
+GPIO_INT(VOLUME_UP_L, PIN(0, 4), GPIO_INT_BOTH, button_interrupt)
GPIO_INT(CHARGE_DONE, PIN(0, 5), GPIO_INT_BOTH, inductive_charging_interrupt)
GPIO(EC_INT_L, PIN(0, 6), 0)