diff options
author | Samsp_Liu <Samsp_Liu@compal.corp-partner.google.com> | 2020-08-31 11:08:17 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-09-02 04:24:50 +0000 |
commit | f2d1c7aca5aa87b3cfbd76fcc6db586bae9508d9 (patch) | |
tree | efe1b095ae1e3925a978f4b744baa85c0d73ff31 /board/delbin | |
parent | 074b0e363491af9c82c9d54fa0c84b8df9ec2e1e (diff) | |
download | chrome-ec-f2d1c7aca5aa87b3cfbd76fcc6db586bae9508d9.tar.gz |
volteer: Support board-specific keyboard_config
Separate keyboard_scan_config keyscan_config
from volteer baseboard to each project board.
To meet different configurations on each board.
BUG=b:149536282
BRANCH=none
TEST=make buildall
Change-Id: I9070953c02ff7d3eb4950191db6505b635371792
Signed-off-by: Samsp_Liu <Samsp_Liu@compal.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2383359
Tested-by: SamSP Liu <samsp_liu@compal.corp-partner.google.com>
Reviewed-by: Elthan Huang <elthan_huang@compal.corp-partner.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: SamSP Liu <samsp_liu@compal.corp-partner.google.com>
Diffstat (limited to 'board/delbin')
-rw-r--r-- | board/delbin/board.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/board/delbin/board.c b/board/delbin/board.c index 6c8e2b1884..a1676e8298 100644 --- a/board/delbin/board.c +++ b/board/delbin/board.c @@ -45,6 +45,24 @@ #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args) +/* Keyboard scan setting */ +struct keyboard_scan_config keyscan_config = { + /* Increase from 50 us, because KSO_02 passes through the H1. */ + .output_settle_us = 80, + /* Other values should be the same as the default configuration. */ + .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, 0xfe, 0xff, 0xff, 0xff, 0xf5, 0xff, + 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, + 0xff /* full set */ + }, +}; + +/******************************************************************************/ /* * FW_CONFIG defaults for Delbin if the CBI data is not initialized. */ @@ -383,26 +401,6 @@ __override const struct ec_response_keybd_config return &delbin_kb; } -static void keyboard_init(void) -{ - keyscan_config.actual_key_mask[0] = 0x1c; - keyscan_config.actual_key_mask[1] = 0xfe; - keyscan_config.actual_key_mask[2] = 0xff; - keyscan_config.actual_key_mask[3] = 0xff; - keyscan_config.actual_key_mask[4] = 0xff; - keyscan_config.actual_key_mask[5] = 0xf5; - keyscan_config.actual_key_mask[6] = 0xff; - keyscan_config.actual_key_mask[7] = 0xa4; - keyscan_config.actual_key_mask[8] = 0xff; - keyscan_config.actual_key_mask[9] = 0xfe; - keyscan_config.actual_key_mask[10] = 0x55; - keyscan_config.actual_key_mask[11] = 0xfe; - keyscan_config.actual_key_mask[12] = 0xff; - keyscan_config.actual_key_mask[13] = 0xff; - keyscan_config.actual_key_mask[14] = 0xff; -} -DECLARE_HOOK(HOOK_INIT, keyboard_init, HOOK_PRIO_INIT_I2C + 1); - /* Called on AP S0ix -> S0 transition */ static void board_chipset_resume(void) { |