diff options
| -rw-r--r-- | board/driblee/board.c | 26 | ||||
| -rw-r--r-- | board/driblee/board.h | 4 |
2 files changed, 3 insertions, 27 deletions
diff --git a/board/driblee/board.c b/board/driblee/board.c index 4a343d6a42..f5b99c7c35 100644 --- a/board/driblee/board.c +++ b/board/driblee/board.c @@ -28,8 +28,7 @@ #include "gpio.h" #include "hooks.h" #include "i2c.h" -#include "keyboard_config.h" -#include "keyboard_raw.h" +#include "keyboard_8042.h" #include "keyboard_scan.h" #include "lid_switch.h" #include "power.h" @@ -61,26 +60,7 @@ const int usb_port_enable[USB_PORT_COUNT] = { }; /* Keyboard scan setting */ -__override struct keyboard_scan_config keyscan_config = { - /* - * F3 key scan cycle completed but scan input is not - * charging to logic high when EC start scan next - * column for "T" key, so we set .output_settle_us - * to 80us from 50us. - */ - .output_settle_us = 80, - .debounce_down_us = 9 * MSEC, - .debounce_up_us = 30 * MSEC, - .scan_period_us = 3 * MSEC, - .min_post_scan_delay_us = 1000, - .poll_timeout_us = 100 * MSEC, - .actual_key_mask = { - 0x1c, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, - 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ - }, -}; - -static const struct ec_response_keybd_config lalala_keybd = { +static const struct ec_response_keybd_config driblee_keybd = { /* Default Chromeos keyboard config */ .num_top_row_keys = 10, .action_keys = { @@ -102,7 +82,7 @@ static const struct ec_response_keybd_config lalala_keybd = { __override const struct ec_response_keybd_config *board_vivaldi_keybd_config(void) { - return &lalala_keybd; + return &driblee_keybd; } /* C0 interrupt line shared by BC 1.2 and charger */ diff --git a/board/driblee/board.h b/board/driblee/board.h index 986b80c672..de19136aff 100644 --- a/board/driblee/board.h +++ b/board/driblee/board.h @@ -41,10 +41,6 @@ #define GPIO_EC_HDMI_EN_ODL GPIO_EC_I2C_SBU_USB_C1_SCL #define GPIO_HDMI_PP3300_EN GPIO_SUB_USB_C1_INT_ODL -/* Keyboard */ - -#define CONFIG_KEYBOARD_KEYPAD - /* LED defines */ #define CONFIG_LED_ONOFF_STATES #define CONFIG_LED_COMMON |