diff options
| author | Wai-Hong Tam <waihong@google.com> | 2021-08-17 16:37:27 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-18 17:14:44 +0000 |
| commit | 2a418330ae2e9661f1198183683d15efb2e56ba6 (patch) | |
| tree | eaafc16a2b6713edba03e407ba79be7f83b973a7 | |
| parent | 79fd35ee861617cc6268d5dd8010ba58b4c87fd4 (diff) | |
| download | chrome-ec-2a418330ae2e9661f1198183683d15efb2e56ba6.tar.gz | |
zephyr: Add support for CONFIG_KEYBOARD_REFRESH_ROW3
Add Kconfig option for CONFIG_KEYBOARD_REFRESH_ROW3.
BRANCH=None
BUG=b:196885613
TEST=zmake testall
Change-Id: Idd55e5bc3af4aab95aa9577b49eb3d8eb5e90630
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3102286
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/Kconfig.keyboard | 8 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index fc303c737d..9ad7fb8316 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -106,6 +106,14 @@ config PLATFORM_EC_KEYBOARD_COL2_INVERTED Refresh key will also trigger T key, which is in the next scanning column line. See http://b/156007029. +config PLATFORM_EC_KEYBOARD_REFRESH_ROW3 + bool "Move the refresh key matrix to row 3 instead of row 2" + help + The Vivaldi keyboards have the refresh key on row 3 instead of row 2. + The legacy keyboards with the assistant key also move the refresh key + matrix to row 3. This is used by the boot key detection code to + determine if the refresh key is held down at boot. + config PLATFORM_EC_VOLUME_BUTTONS bool "Board has volume-up and volume-down buttons" help diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 895e19d568..41c70394f1 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -470,6 +470,11 @@ #define CONFIG_KEYBOARD_COL2_INVERTED #endif /* CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED */ +#undef CONFIG_KEYBOARD_REFRESH_ROW3 +#ifdef CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 +#define CONFIG_KEYBOARD_REFRESH_ROW3 +#endif /* CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 */ + #undef CONFIG_KEYBOARD_KEYPAD #ifdef CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD #define CONFIG_KEYBOARD_KEYPAD |