diff options
author | Justin TerAvest <teravest@chromium.org> | 2019-05-10 17:41:04 +0000 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2019-05-13 01:10:44 +0000 |
commit | 41adb7a6fafb057544bc9ec567d2865150c5f911 (patch) | |
tree | 7fa39065c81733d209b5aa33d9624d3552b93a63 /baseboard | |
parent | f79c141eaad49160b9fc516920b0158b80d441b1 (diff) | |
download | chrome-ec-41adb7a6fafb057544bc9ec567d2865150c5f911.tar.gz |
Revert "octopus: Support keypad function on Bobba"
This reverts commit f79c141eaad49160b9fc516920b0158b80d441b1.
Reason for revert: broke build
Original change's description:
> 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.
>
> BUG=b:131095327
> BRANCH=octopus
> TEST=make buildall
>
> Change-Id: I33ea85ec3966b4bba64b2a5aa11f186b5b92c52b
> Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1600944
> Reviewed-by: Marco Chen <marcochen@chromium.org>
> Reviewed-by: Diana Z <dzigterman@chromium.org>
> (cherry picked from commit 73312c0f227d0b21d5ffa788caa4579c82c78731)
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1605288
> Tested-by: David Huang <David.Huang@quantatw.com>
> Commit-Queue: Marco Chen <marcochen@chromium.org>
Bug: b:131095327
Change-Id: Iff9ec486259733485bae0b65d262ba61fa2b7c54
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1606071
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Commit-Queue: Justin TerAvest <teravest@chromium.org>
Tested-by: Chia-Hsiu Chang <chia-hsiu.chang@quanta.corp-partner.google.com>
Diffstat (limited to 'baseboard')
-rw-r--r-- | baseboard/octopus/baseboard.c | 5 |
1 files changed, 0 insertions, 5 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 }, }; |