diff options
| author | Josh Tsai <josh_tsai@compal.corp-partner.google.com> | 2021-10-04 09:53:13 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-04 20:47:48 +0000 |
| commit | 050de1d90ddd6207b42811a9242e6abed78b0e8d (patch) | |
| tree | bf6982fc8b2303ca84493e2160ddb433495f315f | |
| parent | 55fb1fd6ce8be3d631676af742093db5db0ac239 (diff) | |
| download | chrome-ec-050de1d90ddd6207b42811a9242e6abed78b0e8d.tar.gz | |
Corori: Initialize the vivaldi keyboard
Initialize vivaldi keyboard.
BUG=b:201340797
BRANCH=keeby
TEST=make BOARD=corori
Signed-off-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
Change-Id: I9fd160327f455ec7f78e878c07fbf3e5de66cae7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3201830
Reviewed-by: SamSP Liu <samsp_liu@compal.corp-partner.google.com>
Reviewed-by: Elmo Lan <elmo_lan@compal.corp-partner.google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/corori/board.c | 30 | ||||
| -rw-r--r-- | board/corori/board.h | 4 |
2 files changed, 4 insertions, 30 deletions
diff --git a/board/corori/board.c b/board/corori/board.c index 323a5a8d71..1ecbeeff25 100644 --- a/board/corori/board.c +++ b/board/corori/board.c @@ -27,8 +27,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" @@ -56,27 +55,7 @@ const int usb_port_enable[USB_PORT_COUNT] = { GPIO_EN_USB_A0_VBUS, }; -/* 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 corori_keybd = { /* Default Chromeos keyboard config */ .num_top_row_keys = 10, .action_keys = { @@ -91,14 +70,13 @@ static const struct ec_response_keybd_config lalala_keybd = { TK_VOL_DOWN, /* T9 */ TK_VOL_UP, /* T10 */ }, - /* No function keys, no numeric keypad, has screenlock key */ - .capabilities = KEYBD_CAP_SCRNLOCK_KEY, + /* No function keys, no numeric keypad, no screenlock key */ }; __override const struct ec_response_keybd_config *board_vivaldi_keybd_config(void) { - return &lalala_keybd; + return &corori_keybd; } /* C0 interrupt line shared by BC 1.2 and charger */ diff --git a/board/corori/board.h b/board/corori/board.h index 33370ecd27..42d242abee 100644 --- a/board/corori/board.h +++ b/board/corori/board.h @@ -28,10 +28,6 @@ #undef CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE #define CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE (100 * MSEC) -/* Keyboard */ - -#define CONFIG_KEYBOARD_KEYPAD - /* LED defines */ #define CONFIG_LED_COMMON #define CONFIG_BATTERY_LEVEL_NEAR_FULL 94 |