summaryrefslogtreecommitdiff
path: root/baseboard/hatch
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2020-05-11 10:03:26 -0700
committerCommit Bot <commit-bot@chromium.org>2020-05-11 22:45:29 +0000
commitaf7303f8b929fa0fc11173a27a1fc16666706d9b (patch)
tree00631423eb6dd97eeec673ef24210ec8af432ceb /baseboard/hatch
parent3872ac2772f97cbd919d1537599c52a749b2b8ec (diff)
downloadchrome-ec-af7303f8b929fa0fc11173a27a1fc16666706d9b.tar.gz
hatch: Remove the board keyscan_config definition and use the default
The keyscan_config is the same as the default. Don't define the board custom keyscan_config. For the board.h, most of them have duplicated definitions from the baseboard.h. Remove them by the script: $ grep -rl 'BASEBOARD:=hatch' * | cut -f1 -d/ | xargs -IX sed -i \ '/#define CONFIG_KEYBOARD_BOARD_CONFIG/d' X/board.h BRANCH=hatch BUG=b:156007029 TEST=Build all the hatches boards, no error. Change-Id: Ib02550708d533ced77f5fad05b074291b66dd4fc Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2194160 Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Diffstat (limited to 'baseboard/hatch')
-rw-r--r--baseboard/hatch/baseboard.c21
-rw-r--r--baseboard/hatch/baseboard.h1
2 files changed, 0 insertions, 22 deletions
diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c
index 0866ef091a..3f24e3e690 100644
--- a/baseboard/hatch/baseboard.c
+++ b/baseboard/hatch/baseboard.c
@@ -49,27 +49,6 @@ const enum gpio_signal hibernate_wake_pins[] = {
const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
/******************************************************************************/
-/* 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 = {
- 0x1c, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
- 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */
- },
-};
-
-/******************************************************************************/
/* I2C port map configuration */
const struct i2c_port_t i2c_ports[] = {
#ifdef CONFIG_ACCEL_FIFO
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index f077de20e4..664f02e606 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -60,7 +60,6 @@
/* Common Keyboard Defines */
#define CONFIG_CMD_KEYBOARD
-#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_KEYPAD
#define CONFIG_KEYBOARD_PROTOCOL_8042