diff options
| author | Simon Glass <sjg@chromium.org> | 2021-02-05 10:25:06 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-05 19:23:09 +0000 |
| commit | 36a5eb7f1db04aa123ce3eb9a2d8c86c4c37a0b4 (patch) | |
| tree | 17831b89ca423531579c76a76bd76647de3271ff /zephyr/Kconfig.keyboard | |
| parent | f100477eb89c4722dfec8510a9d047ef8095377e (diff) | |
| download | chrome-ec-36a5eb7f1db04aa123ce3eb9a2d8c86c4c37a0b4.tar.gz | |
zephyr: Update KEYBOARD_PWRBTN_ASSERTS_KSIx to be a choice
We cannot have both KSI2 and KSI3 selected here, so convert this into a
choice. Add a third choice for the case when neither is selected.
BUG=b:167405015, b:179482109
BRANCH=none
TEST=ninja -C /tmp/z/vol/build-ro/ menuconfig
Check the menus look OK
Build volteer for zephyr and check that we still have
CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2 selected
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I0a8de0cf8d60e5d87d3d6d102fcf35c4b8fe06f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2678781
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/Kconfig.keyboard')
| -rw-r--r-- | zephyr/Kconfig.keyboard | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index e14c887aff..693bff0823 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -57,19 +57,34 @@ config PLATFORM_EC_KEYBOARD_KEYPAD placed on the far right. This contains nuumber keys and also some commonly used symbols, to help speed up numeric data entry. +choice "Power button interference" + prompt "Select the impact of pressing the power button" + help + On some boards one of the keyboard-scan inputs is affected by pressing + the power button. When the power button is pressed, that input needs + to be ignored in that case. + +config PLATFORM_EC_KEYBOARD_PWRBTN_INDEPENDENT + bool "No impact on keyboard-scan inputs" + help + Select this if pressing the power button does not affect any + keyboard-scan inputs. + config PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2 - bool "Power-button press forces KSI2 to be asserted" + bool "Forces KSI2 to be asserted" help Enable this if KSI2 is stuck 'asserted' for all scan columns if the power button is held. We must be aware of this case in order to - correctly handle recovery mode key combinations. + correctly handle recovery-mode key combinations. config PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3 - bool "Power-button press forces KSI3 to be asserted" + bool "Forces KSI3 to be asserted" help Enable this if KSI3 is stuck 'asserted' for all scan columns if the power button is held. We must be aware of this case in order to - correctly handle recovery mode key combinations. + correctly handle recovery-mode key combinations. + +endchoice # "Power button interference" config PLATFORM_EC_KEYBOARD_COL2_INVERTED bool "A mechanism for passing KSO2 to H1 which inverts the signal" |