From a7a34232848e1dadbe8abab26ee2a87809aca1ed Mon Sep 17 00:00:00 2001 From: Yu-An Chen Date: Mon, 9 May 2022 13:39:13 +0800 Subject: osiris: Remove volume button undefine CONFIG_VOLUME_BUTTONS set GPIO93 and GPIO97 to unused pins BUG=b:224423318 BRANCH=none TEST=make BOARD=osiris Signed-off-by: Yu-An Chen Change-Id: Iadc90c186dae4dbfd2eee8ddc650826658002577 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3631857 Reviewed-by: Boris Mittelberg Commit-Queue: Boris Mittelberg --- board/osiris/board.h | 4 ++-- board/osiris/gpio.inc | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/board/osiris/board.h b/board/osiris/board.h index 03671e81f4..8e3b6a6b0a 100644 --- a/board/osiris/board.h +++ b/board/osiris/board.h @@ -95,8 +95,6 @@ #define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL #define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL #define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL -#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL -#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_WP_L GPIO_EC_WP_ODL /* System has back-lit keyboard */ @@ -141,6 +139,8 @@ #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 +#undef CONFIG_VOLUME_BUTTONS + #ifndef __ASSEMBLER__ #include "gpio_signal.h" /* needed by registers.h */ diff --git a/board/osiris/gpio.inc b/board/osiris/gpio.inc index adc77a2edc..f1f0501095 100644 --- a/board/osiris/gpio.inc +++ b/board/osiris/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) @@ -125,7 +123,8 @@ UNUSED(PIN(7, 0)) /* GPIO70 */ UNUSED(PIN(4, 1)) /* GPIO41 */ UNUSED(PIN(8, 1)) /* GPIO81 */ UNUSED(PIN(5, 6)) /* GPIO56 */ - +UNUSED(PIN(9, 3)) /* GPIO93 */ +UNUSED(PIN(9, 7)) /* GPIO97 */ /* Pre-configured PSL balls: J8 K6 */ /* -- cgit v1.2.1