diff options
| author | Sue Chen <sue.chen@quanta.corp-partner.google.com> | 2019-05-08 13:21:13 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-21 14:20:37 -0700 |
| commit | 9a21e92fbc0af22ddc86a29b51d8ecf0ab5e2f76 (patch) | |
| tree | 8fdd7c47cea954f5f9a0e76f904b1742ce1e7df0 /baseboard/octopus | |
| parent | b3b26123ef9f84fa0eaaaa3226d717e73860f915 (diff) | |
| download | chrome-ec-9a21e92fbc0af22ddc86a29b51d8ecf0ab5e2f76.tar.gz | |
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.
4. taking care define of TEST_BUILD to prevent broke build since
keyboard_cols from keyboard_scan.c is not in test-list-y yet.
BUG=b:131095327
BRANCH=octopus
TEST=`make buildall` and `make BOARD=bobba tests` both PASS
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Change-Id: I0e98a8f60bf5022503b4a86ee8a5b2bbba3b3825
Reviewed-on: https://chromium-review.googlesource.com/1610390
Commit-Ready: Marco Chen <marcochen@chromium.org>
Commit-Ready: David Huang <David.Huang@quantatw.com>
Tested-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Marco Chen <marcochen@chromium.org>
Reviewed-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Diffstat (limited to 'baseboard/octopus')
| -rw-r--r-- | baseboard/octopus/baseboard.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 8aeb0a8e0b..68e52ffcf7 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -65,8 +65,13 @@ 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 }, }; |