diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-11-06 13:07:48 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-07 19:08:23 +0000 |
| commit | 1665108ad76afffd5d365aee932a96cda3199f78 (patch) | |
| tree | ca692ac9ad7153f19d1cf017b4a60b4cca30c59e | |
| parent | 4e85dbb7bbac0e7f482a42c94cfb6d0f639da913 (diff) | |
| download | chrome-ec-1665108ad76afffd5d365aee932a96cda3199f78.tar.gz | |
Trogdor: Apply internal PU to the interrupt of PI3USB9201
The BC1.2 chip PI3USB9281 some Trogdor old revisions used has push-pull
output on the interrupt pin. But the PI3USB9201 some latest revisions
used has open-drain output. These lines don't have external PU. So apply
EC internal PU.
BRANCH=Trogdor
BUG=b:172674040
TEST=Plugged a C-to-A adapter to a CDP port, the BC1.2 interrupted and
detected the 1.5A source.
Change-Id: I15e27221bff1ce35fc35b03ac38340b5dfb1055d
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2523298
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
| -rw-r--r-- | board/coachz/gpio.inc | 4 | ||||
| -rw-r--r-- | board/lazor/gpio.inc | 4 | ||||
| -rw-r--r-- | board/pompom/gpio.inc | 2 | ||||
| -rw-r--r-- | board/trogdor/gpio.inc | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/board/coachz/gpio.inc b/board/coachz/gpio.inc index 6d86b7ebb7..3da8ec8a8c 100644 --- a/board/coachz/gpio.inc +++ b/board/coachz/gpio.inc @@ -13,8 +13,8 @@ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) / GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-1 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ -GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ -GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING, usb1_evt) /* Interrupt from port-1 BC1.2 */ +GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ +GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb1_evt) /* Interrupt from port-1 BC1.2 */ /* System interrupts */ GPIO_INT(CHG_ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ diff --git a/board/lazor/gpio.inc b/board/lazor/gpio.inc index 234a9e2208..aa8f222b6d 100644 --- a/board/lazor/gpio.inc +++ b/board/lazor/gpio.inc @@ -13,8 +13,8 @@ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) / GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-1 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ -GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ -GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING, usb1_evt) /* Interrupt from port-1 BC1.2 */ +GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ +GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb1_evt) /* Interrupt from port-1 BC1.2 */ /* System interrupts */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ diff --git a/board/pompom/gpio.inc b/board/pompom/gpio.inc index 4e634ad512..d53f56fbec 100644 --- a/board/pompom/gpio.inc +++ b/board/pompom/gpio.inc @@ -11,7 +11,7 @@ /* USB-C interrupts */ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-0 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ -GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ +GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ /* System interrupts */ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index d543fe5f2f..4d6ea0fcf2 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -13,9 +13,13 @@ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) / GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-1 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ +#if BOARD_REV >= TROGDOR_REV1 +GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ +GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb1_evt) /* Interrupt from port-1 BC1.2 */ +#else GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING, usb1_evt) /* Interrupt from port-1 BC1.2 */ - +#endif /* BOARD_REV */ /* System interrupts */ GPIO_INT(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 */ |