diff options
| author | Boris Mittelberg <bmbm@google.com> | 2022-04-13 14:55:03 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-15 23:38:20 +0000 |
| commit | 6782c980921c397d31f66e1c1825ed19ddeb508e (patch) | |
| tree | b307734d45b28960b27b9cf6033e934bf45c212c | |
| parent | dfc3c867af7c684bbbc278809a1b1ebdca958662 (diff) | |
| download | chrome-ec-6782c980921c397d31f66e1c1825ed19ddeb508e.tar.gz | |
brya variants: properly define power button for clamshell devices
Undefine MKBP input devices, it is only relevant for convertibles
BRANCH=none
BUG=none
TEST=manually tested on banshee, primus
Signed-off-by: Boris Mittelberg <bmbm@google.com>
Change-Id: I4396674c00785bc54de74670b1b090e43f9daf14
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3586193
Reviewed-by: YH Lin <yueherngl@chromium.org>
| -rw-r--r-- | board/anahera/board.h | 4 | ||||
| -rw-r--r-- | board/anahera/gpio.inc | 4 | ||||
| -rw-r--r-- | board/banshee/board.h | 4 | ||||
| -rw-r--r-- | board/primus/board.h | 7 | ||||
| -rw-r--r-- | board/vell/board.h | 3 |
5 files changed, 16 insertions, 6 deletions
diff --git a/board/anahera/board.h b/board/anahera/board.h index b4336e950f..4730eba213 100644 --- a/board/anahera/board.h +++ b/board/anahera/board.h @@ -24,6 +24,10 @@ #undef CONFIG_TABLET_MODE_SWITCH #undef CONFIG_GMR_TABLET_MODE +/* No side buttons */ +#undef CONFIG_MKBP_INPUT_DEVICES +#undef CONFIG_VOLUME_BUTTONS + /* USB Type A Features */ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB diff --git a/board/anahera/gpio.inc b/board/anahera/gpio.inc index c1da15cfb7..6e27077daa 100644 --- a/board/anahera/gpio.inc +++ b/board/anahera/gpio.inc @@ -10,8 +10,6 @@ /* INTERRUPT GPIOs: */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) GPIO_INT(EC_PROCHOT_IN_L, PIN(F, 0), GPIO_INT_BOTH, throttle_ap_prochot_input_interrupt) -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(EC_VOLUP_BTN_ODL, PIN(9, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) GPIO_INT(GSC_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_HIB_WAKE_LOW, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) @@ -130,6 +128,8 @@ UNUSED(PIN(B, 5)) /* GPIOB5/I2C0_SCL0 */ UNUSED(PIN(C, 2)) /* GPIOC2/PWM1/I2C6_SCL0 */ UNUSED(PIN(D, 4)) /* GPIOD4/CR_SIN3 */ UNUSED(PIN(F, 5)) /* GPIOF5/I2C5_SCL1 */ +UNUSED(PIN(9, 3)) /* GPIO93/TA1/F_DIO2 */ +UNUSED(PIN(9, 7)) /* GPIO97 */ /* Pre-configured PSL balls: J8 K6 */ diff --git a/board/banshee/board.h b/board/banshee/board.h index a20080147a..f589db07a3 100644 --- a/board/banshee/board.h +++ b/board/banshee/board.h @@ -21,7 +21,11 @@ #undef CONFIG_TABLET_MODE #undef CONFIG_TABLET_MODE_SWITCH #undef CONFIG_GMR_TABLET_MODE + +/* No side buttons */ +#undef CONFIG_MKBP_INPUT_DEVICES #undef CONFIG_VOLUME_BUTTONS + /* * This will happen automatically on NPCX9 ES2 and later. Do not remove * until we can confirm all earlier chips are out of service. diff --git a/board/primus/board.h b/board/primus/board.h index 8d4482277e..0b118efb6d 100644 --- a/board/primus/board.h +++ b/board/primus/board.h @@ -26,6 +26,10 @@ #undef CONFIG_TABLET_MODE_SWITCH #undef CONFIG_GMR_TABLET_MODE +/* No side buttons */ +#undef CONFIG_MKBP_INPUT_DEVICES +#undef CONFIG_VOLUME_BUTTONS + /* USB Type A Features */ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB @@ -162,9 +166,6 @@ #define CONFIG_CMD_PS2 #define PRIMUS_PS2_CH NPCX_PS2_CH1 -/* Button */ -#undef CONFIG_VOLUME_BUTTONS - #ifndef __ASSEMBLER__ #include "gpio_signal.h" /* needed by registers.h */ diff --git a/board/vell/board.h b/board/vell/board.h index de51231ff2..16dc426514 100644 --- a/board/vell/board.h +++ b/board/vell/board.h @@ -19,7 +19,8 @@ */ #define CONFIG_HIBERNATE_PSL_VCC1_RST_WAKEUP -/* Buttons */ +/* No side buttons */ +#undef CONFIG_MKBP_INPUT_DEVICES #undef CONFIG_VOLUME_BUTTONS /* Sensors */ |