summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2016-12-14 11:44:58 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-12-14 20:14:36 -0800
commit8a8af6c10ee6973d17b818f65311fc6f12925f09 (patch)
tree5613b3e8e929bd01ac7603bd5e96a2480b013349
parent4912f214aabf4c9ba231329df0d3583c5ddea9d6 (diff)
downloadchrome-ec-8a8af6c10ee6973d17b818f65311fc6f12925f09.tar.gz
eve: Increase keyscan output settle time to 80us
Increase the output settle time to 80us from the default 50us to prevent duplicate keys. BUG=chrome-os-partner:58666 BRANCH=none TEST=build and boot on eve Change-Id: Ied1acef0b763b9a321f7fe36477eee6e467ce17f Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/419825 Commit-Ready: Duncan Laurie <dlaurie@google.com> Tested-by: Duncan Laurie <dlaurie@google.com> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--board/eve/board.c14
-rw-r--r--board/eve/board.h3
2 files changed, 16 insertions, 1 deletions
diff --git a/board/eve/board.c b/board/eve/board.c
index 5598c9aaad..c3d645fd47 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -96,6 +96,20 @@ const struct power_signal_info power_signal_list[] = {
};
BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
+/* Keyboard scan. Increase output_settle_us to 80us from default 50us. */
+struct keyboard_scan_config keyscan_config = {
+ .output_settle_us = 80,
+ .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 = {
+ 0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
+ 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */
+ },
+};
+
/* PWM channels. Must be in the exactly same order as in enum pwm_channel. */
const struct pwm_t pwm_channels[] = {
[PWM_CH_KBLIGHT] = { 5, PWM_CONFIG_DSLEEP, 100 },
diff --git a/board/eve/board.h b/board/eve/board.h
index 2e6235064d..7fd184f182 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -26,7 +26,6 @@
#define CONFIG_FPU
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
-#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_LID_SWITCH
#define CONFIG_LTO
#define CONFIG_PWM
@@ -53,6 +52,8 @@
#define CONFIG_ESPI
#define CONFIG_ESPI_VW_SIGNALS
#define CONFIG_LPC
+#define CONFIG_KEYBOARD_BOARD_CONFIG
+#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_PROTOCOL_8042
/* Battery */