diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-07-21 10:05:07 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-07-23 05:55:04 +0000 |
commit | 330293d53543cd9af5fbf85fb031f83a940b6d59 (patch) | |
tree | b5ccec3765f6317e386d19f0d8cb69472bf03c34 /baseboard/ite_evb | |
parent | 916fa64ce70441acb9928fda963282d0d5772b63 (diff) | |
download | chrome-ec-330293d53543cd9af5fbf85fb031f83a940b6d59.tar.gz |
keyboard: Use __override for keyboard_scan_config
Currently keyboard_scan_config is defined by each board using
CONFIG_KEYBOARD_BOARD_CONFIG. This patch makes it defined as
__override hence removes CONFIG_KEYBOARD_BOARD_CONFIG.
BUG=None
BRANCH=None
TEST=buildall
Change-Id: I53a356741ba4d00e829ca59b74ee6dc704188728
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3044403
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'baseboard/ite_evb')
-rw-r--r-- | baseboard/ite_evb/baseboard.c | 4 | ||||
-rw-r--r-- | baseboard/ite_evb/baseboard.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/baseboard/ite_evb/baseboard.c b/baseboard/ite_evb/baseboard.c index 0bd537ef4f..00459b12bc 100644 --- a/baseboard/ite_evb/baseboard.c +++ b/baseboard/ite_evb/baseboard.c @@ -106,9 +106,8 @@ const struct fan_tach_t fan_tach[] = { BUILD_ASSERT(ARRAY_SIZE(fan_tach) == PWM_HW_CH_TOTAL); #endif /* defined(CONFIG_FANS) || defined(CONFIG_PWM) */ -#if defined(CONFIG_KEYBOARD_BOARD_CONFIG) /* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { +__override struct keyboard_scan_config keyscan_config = { .output_settle_us = 35, .debounce_down_us = 5 * MSEC, .debounce_up_us = 40 * MSEC, @@ -120,7 +119,6 @@ struct keyboard_scan_config keyscan_config = { 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; -#endif #if defined(CONFIG_SPI_FLASH_PORT) /* SPI devices */ diff --git a/baseboard/ite_evb/baseboard.h b/baseboard/ite_evb/baseboard.h index dfe289e3a6..7fe309491c 100644 --- a/baseboard/ite_evb/baseboard.h +++ b/baseboard/ite_evb/baseboard.h @@ -17,7 +17,7 @@ #define CONFIG_IT83XX_ENABLE_MOUSE_DEVICE #define CONFIG_IT83XX_SMCLK2_ON_GPC7 #define CONFIG_IT83XX_VCC_3P3V -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LOW_POWER_IDLE #define CONFIG_LOW_POWER_S0 |