summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce <Bruce.Wan@quantatw.com>2016-12-02 16:58:27 +0800
committerchrome-bot <chrome-bot@chromium.org>2016-12-07 00:37:02 -0800
commit3e8eb98d7be274b5510d12ff516e1960f1f7aa19 (patch)
treed0ce871a65027ee56d025ae1d4b8aefb2d7add3b
parent81e20f0e589ecada5b30be3f64a09cc805b0a04a (diff)
downloadchrome-ec-3e8eb98d7be274b5510d12ff516e1960f1f7aa19.tar.gz
pyro/snappy: modify keyboard scan rate.
Slow the keyboard scan rate from 50 us to 80 us. BUG=chrome-os-partner:60335 BRANCH=none TEST=check press key "f3" then system only output "f3" scan code. Change-Id: Ic6d009fc45948267447b532beeeb12924ec77069 Signed-off-by: Bruce.Wan <Bruce.Wan@quantatw.com> Reviewed-on: https://chromium-review.googlesource.com/415672 Commit-Ready: Bruce Wan <Bruce.Wan@quantatw.com> Tested-by: Bruce Wan <Bruce.Wan@quantatw.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--board/pyro/board.c20
-rw-r--r--board/pyro/board.h1
-rw-r--r--board/snappy/board.c20
-rw-r--r--board/snappy/board.h1
4 files changed, 42 insertions, 0 deletions
diff --git a/board/pyro/board.c b/board/pyro/board.c
index d3176d7140..759ff8fb54 100644
--- a/board/pyro/board.c
+++ b/board/pyro/board.c
@@ -1010,6 +1010,26 @@ int board_get_version(void)
return version;
}
+/* Keyboard scan setting */
+struct keyboard_scan_config keyscan_config = {
+ /*
+ * F3 key scan cycle completed but scan input is not
+ * charging to logic high when EC start scan next
+ * column for "T" key, so we set .output_settle_us
+ * to 80us from 50us.
+ */
+ .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 */
+ },
+};
+
#ifdef CONFIG_KEYBOARD_FACTORY_TEST
/*
* We have total 32 pins for keyboard connecter, {-1, -1} mean
diff --git a/board/pyro/board.h b/board/pyro/board.h
index 4f11757d40..4662aae1a6 100644
--- a/board/pyro/board.h
+++ b/board/pyro/board.h
@@ -126,6 +126,7 @@
#define CONFIG_HOSTCMD_FLASH_SPI_INFO
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
+#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_PROTOCOL_8042
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_FACTORY_TEST
diff --git a/board/snappy/board.c b/board/snappy/board.c
index c7edd3547a..3b473a5ce0 100644
--- a/board/snappy/board.c
+++ b/board/snappy/board.c
@@ -1010,6 +1010,26 @@ int board_get_version(void)
return version;
}
+/* Keyboard scan setting */
+struct keyboard_scan_config keyscan_config = {
+ /*
+ * F3 key scan cycle completed but scan input is not
+ * charging to logic high when EC start scan next
+ * column for "T" key, so we set .output_settle_us
+ * to 80us from 50us.
+ */
+ .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 */
+ },
+};
+
#ifdef CONFIG_KEYBOARD_FACTORY_TEST
/*
* We have total 21 pins for keyboard connecter, {-1, -1} mean
diff --git a/board/snappy/board.h b/board/snappy/board.h
index 1bf0e3b0aa..708f5635e9 100644
--- a/board/snappy/board.h
+++ b/board/snappy/board.h
@@ -125,6 +125,7 @@
#define CONFIG_HOSTCMD_FLASH_SPI_INFO
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
+#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_PROTOCOL_8042
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_FACTORY_TEST