diff options
| author | ChromeOS Developer <dparker@chromium.org> | 2014-03-20 09:43:30 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-23 22:18:46 +0000 |
| commit | 63a253d6c5bb450e55ac78417539dc7a7f545f5a (patch) | |
| tree | dd15de2a7f9f826eaef4743b4a6364276f6996cf | |
| parent | 9ad01119c5ea4b4af39221f1478d266bda061c86 (diff) | |
| download | chrome-ec-63a253d6c5bb450e55ac78417539dc7a7f545f5a.tar.gz | |
Clapper: Remove side volume buttons
BUG=chrome-os-partner:27085
BRANCH=None
TEST=Verify side mounted volume buttons no longer work
on early revision of clapper.
Change-Id: I15c144bafb833751f37b9cc4f15a9e806e5d6267
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/190868
| -rw-r--r-- | board/clapper/board.c | 13 | ||||
| -rw-r--r-- | board/clapper/board.h | 3 |
2 files changed, 0 insertions, 16 deletions
diff --git a/board/clapper/board.c b/board/clapper/board.c index 90672917d8..c170d96eec 100644 --- a/board/clapper/board.c +++ b/board/clapper/board.c @@ -7,7 +7,6 @@ #include "adc.h" #include "adc_chip.h" #include "backlight.h" -#include "button.h" #include "charge_state.h" #include "charger.h" #include "common.h" @@ -68,10 +67,6 @@ const struct gpio_info gpio_list[] = { {"UART0_RX", LM4_GPIO_A, (1<<0), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, uart_deepsleep_interrupt}, - {"BUTTON_VOLUME_DOWN_L", LM4_GPIO_B, (1<<1), GPIO_INT_BOTH, - button_interrupt}, - {"BUTTON_VOLUME_UP_L", LM4_GPIO_B, (1<<0), GPIO_INT_BOTH, - button_interrupt}, #ifdef HAS_TASK_MOTIONSENSE {"ACCEL_INT_LID", LM4_GPIO_F, (1<<2), GPIO_INT_RISING, accel_int_lid}, @@ -232,14 +227,6 @@ struct ec_thermal_config thermal_params[] = { }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_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_L, - 30 * MSEC, 0}, -}; -BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT); - const int accel_addr[] = { KXCJ9_ADDR0, /* ACCEL_LID */ KXCJ9_ADDR1 /* ACCEL_BASE */ diff --git a/board/clapper/board.h b/board/clapper/board.h index 4e69719b6d..c96c1a9a6b 100644 --- a/board/clapper/board.h +++ b/board/clapper/board.h @@ -14,7 +14,6 @@ #define CONFIG_BACKLIGHT_LID #define CONFIG_BATTERY_SMART #define CONFIG_BOARD_VERSION -#define CONFIG_BUTTON_COUNT 2 #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24715 #define CONFIG_CHARGER_DISCHARGE_ON_AC @@ -87,8 +86,6 @@ enum gpio_signal { GPIO_WP_L, /* Write protect input */ GPIO_JTAG_TCK, /* JTAG clock input */ GPIO_UART0_RX, /* UART0 RX input */ - GPIO_BUTTON_VOLUME_DOWN_L, /* Volume down button */ - GPIO_BUTTON_VOLUME_UP_L, /* Volume up button */ #ifdef HAS_TASK_MOTIONSENSE GPIO_ACCEL_INT_LID, /* Accelerometer interrupt lid */ GPIO_ACCEL_INT_BASE, /* Accelerometer interrupt base */ |