diff options
| author | Mohammed Habibulla <moch@google.com> | 2015-04-22 03:46:57 +0000 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-22 03:50:10 +0000 |
| commit | 4f9e83b735b457bc994025b83b13e286d3e16808 (patch) | |
| tree | 5796ed7e9209e809241b6c1ca1255923845ef123 | |
| parent | edd4022a94fd6059d23f0ceda80a2c56eb9a50a3 (diff) | |
| download | chrome-ec-4f9e83b735b457bc994025b83b13e286d3e16808.tar.gz | |
Revert "Sumo: Implement brightness buttons"
This reverts commit edd4022a94fd6059d23f0ceda80a2c56eb9a50a3.
Change-Id: I68d483d4d558529bcc5a652a69fa34b1750d1092
Reviewed-on: https://chromium-review.googlesource.com/266781
Reviewed-by: Mohammed Habibulla <moch@google.com>
Commit-Queue: Mohammed Habibulla <moch@google.com>
Tested-by: Mohammed Habibulla <moch@google.com>
| -rw-r--r-- | board/sumo/board.c | 14 | ||||
| -rw-r--r-- | board/sumo/board.h | 3 | ||||
| -rw-r--r-- | common/keyboard_8042.c | 2 | ||||
| -rw-r--r-- | include/button.h | 2 |
4 files changed, 0 insertions, 21 deletions
diff --git a/board/sumo/board.c b/board/sumo/board.c index 62194eec16..455f5c1fa3 100644 --- a/board/sumo/board.c +++ b/board/sumo/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" @@ -67,10 +66,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_BRIGHTNESS_DOWN_L", LM4_GPIO_M, (1<<6), GPIO_INT_BOTH, - button_interrupt}, - {"BUTTON_BRIGHTNESS_UP_L", LM4_GPIO_J, (1<<5), GPIO_INT_BOTH, - button_interrupt}, /* Other inputs */ {"BOARD_VERSION1", LM4_GPIO_Q, (1<<5), GPIO_INPUT, NULL}, @@ -201,12 +196,3 @@ struct ec_thermal_config thermal_params[] = { {{0, 0, 0}, 0, 0}, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); - -const struct button_config buttons[] = { - {"Brightness Down", KEYBOARD_BUTTON_BRIGHTNESS_DOWN, - GPIO_BUTTON_BRIGHTNESS_DOWN_L, 30 * MSEC, 0}, - {"Brightness Up", KEYBOARD_BUTTON_BRIGHTNESS_UP, - GPIO_BUTTON_BRIGHTNESS_UP_L, 30 * MSEC, 0}, -}; -BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT); - diff --git a/board/sumo/board.h b/board/sumo/board.h index 553bcbdb9c..9071991087 100644 --- a/board/sumo/board.h +++ b/board/sumo/board.h @@ -12,7 +12,6 @@ #define CONFIG_AP_HANG_DETECT #define CONFIG_BACKLIGHT_LID #define CONFIG_BOARD_VERSION -#define CONFIG_BUTTON_COUNT 2 #define CONFIG_CHIPSET_BAYTRAIL #define CONFIG_CHIPSET_CAN_THROTTLE #define CONFIG_CHIPSET_X86 @@ -79,8 +78,6 @@ enum gpio_signal { GPIO_WP_L, /* Write protect input */ GPIO_JTAG_TCK, /* JTAG clock input */ GPIO_UART0_RX, /* UART0 RX input */ - GPIO_BUTTON_BRIGHTNESS_DOWN_L, /* Brightness down button */ - GPIO_BUTTON_BRIGHTNESS_UP_L, /* Brightness up button */ /* Other inputs */ GPIO_BOARD_VERSION1, /* Board version stuffing resistor 1 */ diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index cdcb6d2359..0d8192b166 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -206,8 +206,6 @@ static const struct button_8042_t buttons_8042[] = { {0xe05e, 0xe037, 0}, /* Power */ {0xe02e, 0xe021, 1}, /* Volume Down */ {0xe030, 0xe032, 1}, /* Volume Up */ - {0x40, 0x0b, 1}, /* Brightness Down */ - {0x41, 0x83, 1}, /* Brightness Up */ }; BUILD_ASSERT(ARRAY_SIZE(buttons_8042) == KEYBOARD_BUTTON_COUNT); diff --git a/include/button.h b/include/button.h index 349ed178be..eedf7974f8 100644 --- a/include/button.h +++ b/include/button.h @@ -17,8 +17,6 @@ enum keyboard_button_type { KEYBOARD_BUTTON_POWER = 0, KEYBOARD_BUTTON_VOLUME_DOWN, KEYBOARD_BUTTON_VOLUME_UP, - KEYBOARD_BUTTON_BRIGHTNESS_DOWN, - KEYBOARD_BUTTON_BRIGHTNESS_UP, KEYBOARD_BUTTON_COUNT }; |