diff options
author | Knox Chiou <knoxchiou@google.com> | 2022-05-31 13:05:02 +0800 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-01 21:21:16 +0000 |
commit | 882f058752e21b31d89b26026e30410583ec75a0 (patch) | |
tree | 007ea73b847b33d25d2078c70b132dbbfe765258 | |
parent | 243ec6c7ab5b93dd70193b7716c8875eb4fb18f9 (diff) | |
download | chrome-ec-882f058752e21b31d89b26026e30410583ec75a0.tar.gz |
trogdor: Remove incorrect volume config from kingoftown/pazquel
There's no side volume button for kingoftown/pazquel.
Remove incorrect config.
BUG=b:234175434
BRANCH=trogdor
TEST=emerge-trogdor chromeos-ec and check ectool mkbpget button
Signed-off-by: Knox Chiou <knoxchiou@google.com>
Change-Id: Ica13644dc9947b38219aa27aacfe7661cec15e86
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3677835
Tested-by: Knox Chiou <knoxchiou@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Auto-Submit: Knox Chiou <knoxchiou@chromium.org>
-rw-r--r-- | board/kingoftown/board.h | 3 | ||||
-rw-r--r-- | board/kingoftown/gpio.inc | 4 | ||||
-rw-r--r-- | board/pazquel/board.h | 3 | ||||
-rw-r--r-- | board/pazquel/gpio.inc | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/board/kingoftown/board.h b/board/kingoftown/board.h index 02f54aff55..e71fdd6741 100644 --- a/board/kingoftown/board.h +++ b/board/kingoftown/board.h @@ -38,6 +38,9 @@ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB +/* No side volume button */ +#undef CONFIG_VOLUME_BUTTONS + /* Sensors */ /* BMI160 Base accel/gyro */ #define CONFIG_ACCELGYRO_BMI160 diff --git a/board/kingoftown/gpio.inc b/board/kingoftown/gpio.inc index 8634dc848c..612de59128 100644 --- a/board/kingoftown/gpio.inc +++ b/board/kingoftown/gpio.inc @@ -20,8 +20,6 @@ GPIO_INT(USB_A0_OC_ODL, PIN(D, 1), GPIO_INT_BOTH | GPIO_PULL_UP, usba_oc_ /* System interrupts */ GPIO_INT(CHG_ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* Power button */ -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Up button */ -GPIO_INT(EC_VOLUP_BTN_ODL, PIN(F, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Down button */ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Write protection */ GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */ GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */ @@ -159,6 +157,8 @@ UNUSED(PIN(B, 1)) UNUSED(PIN(5, 0)) UNUSED(PIN(D, 3)) UNUSED(PIN(C, 6)) +UNUSED(PIN(7, 0)) +UNUSED(PIN(F, 2)) /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART (GPIO64/65) */ diff --git a/board/pazquel/board.h b/board/pazquel/board.h index 941af87334..dc80fc9829 100644 --- a/board/pazquel/board.h +++ b/board/pazquel/board.h @@ -37,6 +37,9 @@ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB +/* No side volume button */ +#undef CONFIG_VOLUME_BUTTONS + /* Sensors */ #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT /* BMI160 Base accel/gyro */ diff --git a/board/pazquel/gpio.inc b/board/pazquel/gpio.inc index 0d7e73fca2..4ebd09b4ee 100644 --- a/board/pazquel/gpio.inc +++ b/board/pazquel/gpio.inc @@ -21,8 +21,6 @@ GPIO_INT(USB_A0_OC_ODL, PIN(D, 1), GPIO_INT_BOTH | GPIO_PULL_UP, usba_oc_ GPIO_INT(CHG_ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ GPIO_INT(CCD_MODE_ODL, PIN(E, 3), GPIO_INT_FALLING, board_connect_c0_sbu) /* Case Closed Debug Mode */ GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* Power button */ -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Up button */ -GPIO_INT(EC_VOLUP_BTN_ODL, PIN(F, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Down button */ GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* Write protection */ GPIO_INT(LID_OPEN_EC, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) /* Lid open */ GPIO_INT(AP_RST_L, PIN(C, 1), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_ap_rst_interrupt) /* PMIC to signal AP reset */ @@ -159,6 +157,8 @@ UNUSED(PIN(8, 3)) UNUSED(PIN(B, 1)) UNUSED(PIN(5, 0)) UNUSED(PIN(D, 3)) +UNUSED(PIN(7, 0)) +UNUSED(PIN(F, 2)) /* Alternate functions GPIO definitions */ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART (GPIO64/65) */ |