diff options
| author | Justin TerAvest <teravest@chromium.org> | 2019-05-10 17:41:26 +0000 |
|---|---|---|
| committer | Justin TerAvest <teravest@chromium.org> | 2019-05-10 18:57:08 +0000 |
| commit | 1009c67272f56d66f4d23a2994bf30809a0deef5 (patch) | |
| tree | 04561fd16f711500726995b0c49be344c618e81c | |
| parent | ce957ef6a084580c0d75694bc5d992f252a4a67f (diff) | |
| download | chrome-ec-1009c67272f56d66f4d23a2994bf30809a0deef5.tar.gz | |
Revert "octopus: Support keypad function on Bobba"
This reverts commit 73312c0f227d0b21d5ffa788caa4579c82c78731.
Reason for revert: broke build
Original change's description:
> octopus: Support keypad function on Bobba
>
> 1. Using CONFIG_KEYBOARD_KEYPAD to choose actual_key_mask w or w/o keypad.
> 2. Enable keypad function on Bobba.
> 3. Disable scan KSO13 & 14 and modify actual_key_mask for SKU w/o keypad on
> Bobba.
>
> BUG=b:131095327
> BRANCH=octopus
> TEST=make buildall
>
> Change-Id: I33ea85ec3966b4bba64b2a5aa11f186b5b92c52b
> Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1600944
> Reviewed-by: Marco Chen <marcochen@chromium.org>
> Reviewed-by: Diana Z <dzigterman@chromium.org>
Bug: b:131095327
Change-Id: Ic5228fb5047b6c3a6a05b9e8ce9e47677758c2e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1606072
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Commit-Queue: Justin TerAvest <teravest@chromium.org>
Tested-by: Justin TerAvest <teravest@chromium.org>
| -rw-r--r-- | baseboard/octopus/baseboard.c | 5 | ||||
| -rw-r--r-- | board/bobba/board.c | 21 | ||||
| -rw-r--r-- | board/bobba/board.h | 3 |
3 files changed, 0 insertions, 29 deletions
diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 68e52ffcf7..8aeb0a8e0b 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -65,13 +65,8 @@ struct keyboard_scan_config keyscan_config = { .min_post_scan_delay_us = 1000, .poll_timeout_us = 100 * MSEC, .actual_key_mask = { -#ifndef CONFIG_KEYBOARD_KEYPAD 0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ -#else - 0x1c, 0xfe, 0xff, 0xff, 0xff, 0xf5, 0xff, - 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ -#endif }, }; diff --git a/board/bobba/board.c b/board/bobba/board.c index 9e53014fb5..eca68e19ca 100644 --- a/board/bobba/board.c +++ b/board/bobba/board.c @@ -26,7 +26,6 @@ #include "gpio.h" #include "hooks.h" #include "i2c.h" -#include "keyboard_raw.h" #include "keyboard_scan.h" #include "lid_switch.h" #include "motion_sense.h" @@ -279,25 +278,6 @@ static void board_update_sensor_config_from_sku(void) } } -static int board_has_keypad(void) -{ - return sku_id == 41 || sku_id == 42 || sku_id == 43 || sku_id == 44; -} - -static void board_update_no_keypad_config_from_sku(void) -{ - if (!board_has_keypad()) { - /* Disable scanning KSO13 & 14 if keypad isn't present. */ - keyboard_raw_set_cols(KEYBOARD_COLS_NO_KEYPAD); - keyscan_config.actual_key_mask[11] = 0xfa; - keyscan_config.actual_key_mask[12] = 0xca; - - /* Search key is moved back to col=1,row=0 */ - keyscan_config.actual_key_mask[0] = 0x14; - keyscan_config.actual_key_mask[1] = 0xff; - } -} - /* Read CBI from i2c eeprom and initialize variables for board variants */ static void cbi_init(void) { @@ -309,7 +289,6 @@ static void cbi_init(void) CPRINTSUSB("SKU: %d", sku_id); board_update_sensor_config_from_sku(); - board_update_no_keypad_config_from_sku(); } DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); diff --git a/board/bobba/board.h b/board/bobba/board.h index e893e29537..9ab8fb0ab1 100644 --- a/board/bobba/board.h +++ b/board/bobba/board.h @@ -58,9 +58,6 @@ #define CONFIG_PWM #define CONFIG_PWM_KBLIGHT -/* keypad */ -#define CONFIG_KEYBOARD_KEYPAD - #ifndef __ASSEMBLER__ /* support factory keyboard test */ |