diff options
| author | Keith Short <keithshort@chromium.org> | 2020-02-14 15:21:50 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-27 20:50:08 +0000 |
| commit | c2f751f107d88d910f4631eeb8c6f4f9a99b9d81 (patch) | |
| tree | ea4742de3a983c9b98fb452cf7f79c5fbbf849a1 /board | |
| parent | 6c0c6ec6b08a14ea0c1e612d585cdb825bb2f1cf (diff) | |
| download | chrome-ec-c2f751f107d88d910f4631eeb8c6f4f9a99b9d81.tar.gz | |
volteer: Configure EC_VOLUP_BTN_ODL for next build
Update the GPIO assignment for the EC_VOLUP_BTN_ODL signal for the next
board build.
BUG=b:144933528
BRANCH=none
TEST=make buildall
TEST=Verify volume buttons with board ID=0
Change-Id: I28e53573b6a6a9ba7e5df0458ded8b988c25ac04
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2065489
Reviewed-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/volteer/gpio.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index 02a63c98f0..c9e6183f10 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -47,8 +47,15 @@ GPIO_INT(USB_C1_MIX_INT_ODL, PIN(0, 3), GPIO_INT_BOTH, bc12_interrupt) /* HDMI interrupts */ /* Volume button interrupts */ -GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(EC_VOLUP_BTN_ODL, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +/* + * EC_VOLUP_BTN_ODL moved from GPIO75 to GPIO97 on boards with board ID >=1. + * GPIO97/EN_PP1050_BYPASS is DNS on board ID 0, and GPIO75 will be used once + * EFS support is added. + * TODO (b/149858568): remove board ID=0 support. + */ +GPIO_INT(EC_VOLUP_BTN_ODL_BOARDID_0, PIN(7, 5), 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) /* Power Sequencing Signals */ GPIO(EN_PP3300_A, PIN(A, 3), GPIO_OUT_LOW) @@ -64,7 +71,6 @@ GPIO(EN_PP5000_USB_AG, PIN(A, 7), GPIO_OUT_LOW) GPIO(EN_PPVAR_VCCIN_AUX, PIN(8, 1), GPIO_OUT_LOW) GPIO(EN_PP1050_ST_S0, PIN(3, 4), GPIO_OUT_LOW) GPIO(EN_VNN_BYPASS, PIN(B, 0), GPIO_OUT_LOW) -GPIO(EN_PP1050_BYPASS, PIN(9, 7), GPIO_OUT_LOW) GPIO(EN_DRAM_VDD1, PIN(9, 6), GPIO_OUT_LOW) #endif |