diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2020-03-11 18:30:50 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-12 20:59:22 +0000 |
| commit | 02ecfd050685e60e66057de229109a8cb7522f52 (patch) | |
| tree | 2e77055609a4d17377a0201da47a6be211b8324d /board/waddledoo/gpio.inc | |
| parent | d9ee9a446f5eccc61efd67b53f9d89847d0b3bd5 (diff) | |
| download | chrome-ec-02ecfd050685e60e66057de229109a8cb7522f52.tar.gz | |
waddledoo: Swap EN_PP5000_U & VOLUP_BTN_ODL
On the older boards, the 5V enable was swapped with the volume up
button. We worked around it in firmware, but for the next builds we
need to fix the firmware such that it matches reality. This commit
adds a remap which will allow the 5V enable to work for all boards
based upon the board version stored in CBI. However, this will break
the volume up button on the older boards as our interrupt table is
statically defined at compile time.
BUG=b:147257497
BRANCH=None
TEST=Build and flash a waddledoo with unformatted CBI EEPROM, verify
that the 5V rail still being controlled.
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I9892b057054800a3acff5e2c2316921a479b32a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2099746
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/waddledoo/gpio.inc')
| -rw-r--r-- | board/waddledoo/gpio.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc index 98eca3109c..82a34cf599 100644 --- a/board/waddledoo/gpio.inc +++ b/board/waddledoo/gpio.inc @@ -31,8 +31,7 @@ GPIO_INT(SUB_USB_C1_INT_ODL, PIN(F, 5), GPIO_INT_FALLING | GPIO_PULL_UP, sub_us /* Button interrupts */ GPIO_INT(H1_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) GPIO_INT(VOLDN_BTN_ODL, PIN(4, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -/* TODO(b:147257497) Fix this and EN_PP5000_U before board rev 0. */ -GPIO_INT(VOLUP_BTN_ODL, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUP_BTN_ODL, PIN(7, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Other interrupts */ GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt) @@ -63,7 +62,7 @@ GPIO(EN_VCCIO_EXT, PIN(6, 1), GPIO_OUT_LOW) GPIO(EN_VCCST, PIN(A, 7), GPIO_INPUT) GPIO(EN_PP3300_PEN, PIN(6, 3), GPIO_OUT_LOW) GPIO(EN_PP3300_A, PIN(0, 3), GPIO_OUT_LOW) -GPIO(EN_PP5000_U, PIN(7, 3), GPIO_OUT_LOW) +GPIO(EN_PP5000_U, PIN(A, 4), GPIO_OUT_LOW) GPIO(EN_SLP_Z, PIN(8, 3), GPIO_OUT_LOW) GPIO(EN_KB_BL, PIN(6, 0), GPIO_OUT_LOW) GPIO(EN_BL_OD, PIN(D, 3), GPIO_ODR_LOW) |