diff options
author | Keith Short <keithshort@chromium.org> | 2020-02-14 14:31:18 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-26 01:04:51 +0000 |
commit | ff6cbc138b6ed692fcbae21bd9bf12837c2aeb79 (patch) | |
tree | 4ec732a06ca8582ca419e893e7030fb0c2134c61 /board/volteer | |
parent | 2696c706b8b97f28dfc5448687f168e9225cc61f (diff) | |
download | chrome-ec-ff6cbc138b6ed692fcbae21bd9bf12837c2aeb79.tar.gz |
volteer: Update USB C1 reset for next buildstabilize-volteer-12931.B-master
Update the GPIO assignment for the USB_C1_RT_RST_ODL signal for the next
board build.
BUG=b:144933528, b:148243971
BRANCH=none
TEST=make buildall
TEST=Check unassigned board ID or board ID=0 uses legacy GPIO setting.
Otherwise new GPIO setting is used.
Change-Id: I4621e039e4461a4e10ab87bc2d4e000b5dcaa885
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2057496
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/volteer')
-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 d4cbfcaa47..02a63c98f0 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -61,7 +61,6 @@ UNIMPLEMENTED(PCH_DSW_PWROK) GPIO(EN_DRAM_VDDQ, PIN(F, 2), GPIO_OUT_LOW) GPIO(EN_PP1050_STG, PIN(C, 0), GPIO_OUT_LOW) GPIO(EN_PP5000_USB_AG, PIN(A, 7), GPIO_OUT_LOW) -GPIO(EN_PP1800_A, PIN(8, 3), 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) @@ -95,8 +94,15 @@ GPIO(EC_PCH_INT_ODL, PIN(D, 6), GPIO_ODR_HIGH) /* TODO - b/140557015 - /* USB and USBC Signals */ -/* TODO(b/148243971): update PIN for next build */ -GPIO(USB_C1_RT_RST_ODL, PIN(3, 2), GPIO_ODR_LOW) /* USB_C1 Reset */ +/* + * USB_C1 moved from GPIO32 to GPIO83 on boards with board ID >=1. + * GPIO83/EN_PP1800_A is DNS on board ID 0 and GPIO32 is N/C on board ID >=1 + * so it's safe to define GPIOs compatible with both designs. + * TODO (b/149858568): remove board ID=0 support. + */ +GPIO(USB_C1_RT_RST_ODL_BOARDID_0, PIN(3, 2), GPIO_ODR_LOW) /* USB_C1 Reset on boards without board ID */ +GPIO(USB_C1_RT_RST_ODL, PIN(8, 3), GPIO_ODR_LOW) /* USB_C1 Reset on boards board ID >=1 */ + /* Don't have a load switch for retimer */ UNIMPLEMENTED(USB_C1_LS_EN) /* Retimer Force Power enable is connected to AP */ |