From fa985803d6bd7c76b8eddc49d1bab4434cc545f3 Mon Sep 17 00:00:00 2001 From: Boris Mittelberg Date: Tue, 13 Apr 2021 22:49:42 +0000 Subject: mkbp: Move key simulation to input devices Today some platforms include MKBP_KEYBOARD because they use side buttons, switches or other events that share the same driver with MKBP keyboard. Those platforms don't enable KEYSCAN task. The CL is moving key emulation functionality to MKBP input devices, to make a clear separation between the real keyboard usage and emulation/buttons/switches/etc. All boards that were selecting `CONFIG_KEYBOARD_PROTOCOL_MKBP` without KEYSCAN task are now updated to select `CONFIG_MKBP_INPUT_DEVICES` BUG=b:170966461 BRANCH=main,firmware-dedede-13606.B,firmware-volteer-13672.B-main TEST=None Signed-off-by: Boris Mittelberg Change-Id: I515140ebf6e175f4b29991329f92266ffca232a8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2824044 --- board/ambassador/board.h | 2 +- board/cheza/board.h | 2 +- board/coachz/board.h | 2 ++ board/dooly/board.h | 2 +- board/endeavour/board.h | 2 +- board/fizz/board.h | 2 +- board/flapjack/board.h | 2 +- board/genesis/board.h | 2 +- board/homestar/board.h | 2 ++ board/kakadu/board.h | 1 + board/katsu/board.h | 1 + board/kodama/board.h | 1 + board/kukui/board.h | 1 + board/lazor/board.h | 1 + board/marzipan/board.h | 1 + board/nocturne/board.h | 2 +- board/pompom/board.h | 1 + board/poppy/board.h | 2 +- board/puff/board.h | 2 +- board/rainier/board.h | 2 +- board/scarlet/board.h | 3 ++- board/trogdor/board.h | 1 + 22 files changed, 25 insertions(+), 12 deletions(-) (limited to 'board') diff --git a/board/ambassador/board.h b/board/ambassador/board.h index d44a0ec681..52412b4bfe 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -34,7 +34,7 @@ #define CONFIG_CROS_BOARD_INFO #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_HOST_EVENT #undef CONFIG_KEYBOARD_RUNTIME_KEYS #undef CONFIG_HIBERNATE diff --git a/board/cheza/board.h b/board/cheza/board.h index 45a1927c82..f30219aaf5 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -54,7 +54,7 @@ #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_HOSTCMD_SECTION_SORTED /* Host commands are sorted. */ #define CONFIG_MKBP_EVENT -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_GPIO #define CONFIG_BOARD_VERSION_GPIO diff --git a/board/coachz/board.h b/board/coachz/board.h index f60ce352d9..268dcb5b89 100644 --- a/board/coachz/board.h +++ b/board/coachz/board.h @@ -51,6 +51,8 @@ #define CONFIG_GMR_TABLET_MODE #define CONFIG_FRONT_PROXIMITY_SWITCH +#define CONFIG_MKBP_INPUT_DEVICES + #define CONFIG_DETACHABLE_BASE #define CONFIG_BASE_ATTACHED_SWITCH diff --git a/board/dooly/board.h b/board/dooly/board.h index 6043ad6aeb..51259c006b 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -69,7 +69,7 @@ #define CONFIG_CROS_BOARD_INFO #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_HOST_EVENT #undef CONFIG_KEYBOARD_RUNTIME_KEYS #undef CONFIG_HIBERNATE diff --git a/board/endeavour/board.h b/board/endeavour/board.h index a3d871604f..eca98dad6d 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -24,7 +24,7 @@ #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_EMULATED_SYSRQ #define CONFIG_LED_COMMON -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_DPTF #define CONFIG_FLASH_SIZE_BYTES 0x80000 diff --git a/board/fizz/board.h b/board/fizz/board.h index da48944973..160680edb6 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -25,7 +25,7 @@ #define CONFIG_DEDICATED_RECOVERY_BUTTON #define CONFIG_EMULATED_SYSRQ #define CONFIG_LED_COMMON -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_DPTF #define CONFIG_FLASH_SIZE_BYTES 0x80000 diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 4d077ad21d..be9ec8b9b4 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -251,7 +251,7 @@ /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_GPIO /* Define the host events which are allowed to wakeup AP in S3. */ diff --git a/board/genesis/board.h b/board/genesis/board.h index de82b84540..b380ac28f9 100644 --- a/board/genesis/board.h +++ b/board/genesis/board.h @@ -34,7 +34,7 @@ #define CONFIG_CROS_BOARD_INFO #define CONFIG_EMULATED_SYSRQ #undef CONFIG_KEYBOARD_BOOT_KEYS -#define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_USE_HOST_EVENT #undef CONFIG_KEYBOARD_RUNTIME_KEYS #undef CONFIG_HIBERNATE diff --git a/board/homestar/board.h b/board/homestar/board.h index 12bfb53879..4267d8bacb 100644 --- a/board/homestar/board.h +++ b/board/homestar/board.h @@ -71,6 +71,8 @@ #define GMR_TABLET_MODE_GPIO_L GPIO_LID_OPEN_EC #define GPIO_SWITCHCAP_PG_INT_L GPIO_LN9310_INT +#define CONFIG_MKBP_INPUT_DEVICES + #ifndef __ASSEMBLER__ #include "gpio_signal.h" diff --git a/board/kakadu/board.h b/board/kakadu/board.h index 2dd4ff2c5d..6cecfaed2b 100644 --- a/board/kakadu/board.h +++ b/board/kakadu/board.h @@ -65,6 +65,7 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) /* MKBP */ +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_EVENT_WAKEUP_MASK \ (BIT(EC_MKBP_EVENT_SENSOR_FIFO) | BIT(EC_MKBP_EVENT_HOST_EVENT)) diff --git a/board/katsu/board.h b/board/katsu/board.h index 44d6e9de59..bdc552a9c5 100644 --- a/board/katsu/board.h +++ b/board/katsu/board.h @@ -65,6 +65,7 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) /* MKBP */ +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_EVENT_WAKEUP_MASK \ (BIT(EC_MKBP_EVENT_SENSOR_FIFO) | BIT(EC_MKBP_EVENT_HOST_EVENT)) diff --git a/board/kodama/board.h b/board/kodama/board.h index 60bace8cc8..98e9b219ac 100644 --- a/board/kodama/board.h +++ b/board/kodama/board.h @@ -63,6 +63,7 @@ #define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY /* Define the host events which are allowed to wakeup AP in S3. */ +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON)) diff --git a/board/kukui/board.h b/board/kukui/board.h index 28f0c80cf1..bbb66d4e41 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -94,6 +94,7 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) /* MKBP */ +#define CONFIG_MKBP_INPUT_DEVICES #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_EVENT_WAKEUP_MASK \ (BIT(EC_MKBP_EVENT_SENSOR_FIFO) | BIT(EC_MKBP_EVENT_HOST_EVENT)) diff --git a/board/lazor/board.h b/board/lazor/board.h index 3a1edee983..d4f4426d05 100644 --- a/board/lazor/board.h +++ b/board/lazor/board.h @@ -17,6 +17,7 @@ #define CONFIG_LN9310 /* Keyboard */ +#define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_PWM_KBLIGHT diff --git a/board/marzipan/board.h b/board/marzipan/board.h index bc070bc02f..54054456eb 100644 --- a/board/marzipan/board.h +++ b/board/marzipan/board.h @@ -14,6 +14,7 @@ #define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* 512KB internal spi flash */ /* Keyboard */ +#define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_PWM_KBLIGHT diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 046b41d7db..a009cc118a 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -89,7 +89,7 @@ /* MKBP */ #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_EVENT_WAKEUP_MASK (1<