summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baseboard/octopus/baseboard.c5
-rw-r--r--board/bobba/board.c21
-rw-r--r--board/bobba/board.h3
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 */