From af7303f8b929fa0fc11173a27a1fc16666706d9b Mon Sep 17 00:00:00 2001 From: Wai-Hong Tam Date: Mon, 11 May 2020 10:03:26 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2194160 Reviewed-by: Paul Fagerburg --- baseboard/hatch/baseboard.c | 21 --------------------- baseboard/hatch/baseboard.h | 1 - board/akemi/board.h | 1 - board/dratini/board.h | 1 - board/hatch/board.h | 1 - board/helios/board.h | 1 - board/jinlon/board.h | 1 - board/kindred/board.h | 1 - board/kohaku/board.h | 1 - board/mushu/board.h | 1 - board/nightfury/board.h | 1 - board/palkia/board.h | 1 - board/stryke/board.h | 1 - board/sushi/board.h | 1 - 14 files changed, 34 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 @@ -48,27 +48,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[] = { 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 diff --git a/board/akemi/board.h b/board/akemi/board.h index 85d898b566..2d4482a8d6 100644 --- a/board/akemi/board.h +++ b/board/akemi/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/dratini/board.h b/board/dratini/board.h index 963a4cb590..bc45b2ca47 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #undef CONFIG_LED_ONOFF_STATES #define CONFIG_LED_COMMON diff --git a/board/hatch/board.h b/board/hatch/board.h index 040d6ea76f..057475cb55 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/helios/board.h b/board/helios/board.h index e1445394c3..17e719abb0 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LED_POWER_LED diff --git a/board/jinlon/board.h b/board/jinlon/board.h index b9509288b6..f898b90c9a 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -13,7 +13,6 @@ #define CONFIG_DPTF_MULTI_PROFILE #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_REFRESH_ROW3 #undef CONFIG_LED_ONOFF_STATES diff --git a/board/kindred/board.h b/board/kindred/board.h index 79156ccf01..067a266bdb 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/kohaku/board.h b/board/kohaku/board.h index d51609da38..196365b9da 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -15,7 +15,6 @@ #define CONFIG_DPTF_MULTI_PROFILE #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/mushu/board.h b/board/mushu/board.h index ae1baf22cd..5629782fa8 100644 --- a/board/mushu/board.h +++ b/board/mushu/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/nightfury/board.h b/board/nightfury/board.h index 1acb067e0b..074b0666b6 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -15,7 +15,6 @@ #define CONFIG_DPTF_MULTI_PROFILE #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/palkia/board.h b/board/palkia/board.h index 62aac0e9a7..1112449fcf 100644 --- a/board/palkia/board.h +++ b/board/palkia/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LED_POWER_LED diff --git a/board/stryke/board.h b/board/stryke/board.h index cace15efe3..4bc1839787 100644 --- a/board/stryke/board.h +++ b/board/stryke/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE diff --git a/board/sushi/board.h b/board/sushi/board.h index 0d398d1b19..66a2844d1d 100644 --- a/board/sushi/board.h +++ b/board/sushi/board.h @@ -12,7 +12,6 @@ #include "baseboard.h" #define CONFIG_POWER_BUTTON -#define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LED_COMMON #define CONFIG_LOW_POWER_IDLE -- cgit v1.2.1