diff options
| author | Scott Collyer <scollyer@google.com> | 2021-10-19 10:40:21 -0700 |
|---|---|---|
| committer | Scott Collyer <scollyer@google.com> | 2021-10-19 10:40:21 -0700 |
| commit | df6d8b05401b5b3436b2a8ae95d31ac48c21ca06 (patch) | |
| tree | 01e9b1d50bdf9242f0167572b2836405d138133b /board/brask/gpio.inc | |
| parent | 18f90f4d72e35a34ed4d9196c474c13b382c52fa (diff) | |
| parent | 7dcbbb899b5ee0c68c490a88343305f20074f371 (diff) | |
| download | chrome-ec-df6d8b05401b5b3436b2a8ae95d31ac48c21ca06.tar.gz | |
Merge remote-tracking branch 'remotes/m/master' into fw-quiche-merge-yellow-bang
Signed-off-by: Scott Collyer <scollyer@google.com>
Change-Id: Idf74bda59e3a4706adcea9310c2780d142e797aa
Diffstat (limited to 'board/brask/gpio.inc')
| -rw-r--r-- | board/brask/gpio.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/board/brask/gpio.inc b/board/brask/gpio.inc index 01b82a2b74..b79690c903 100644 --- a/board/brask/gpio.inc +++ b/board/brask/gpio.inc @@ -26,6 +26,7 @@ GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(A, 2), GPIO_INT_FALLING, tcpc_alert_eve GPIO_INT(USB_C2_BC12_INT_ODL, PIN(8, 3), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C2_PPC_INT_ODL, PIN(7, 0), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C2_RT_INT_ODL, PIN(4, 1), GPIO_INT_FALLING, retimer_interrupt) +GPIO_INT(BJ_ADP_PRESENT_ODL, PIN(8, 2), GPIO_INT_BOTH | GPIO_PULL_UP, adp_connect_interrupt) /* CCD */ GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT) @@ -45,8 +46,7 @@ GPIO(DP_CONN_OC_ODL, PIN(2, 5), GPIO_INPUT) GPIO(HDMI_CONN_OC_ODL, PIN(2, 4), GPIO_INPUT) /* BarrelJack */ -GPIO(EN_PPVAR_BJ_ADP_L, PIN(0, 7), GPIO_INPUT) -GPIO(BJ_ADP_PRESENT_ODL, PIN(8, 2), GPIO_INPUT) +GPIO(EN_PPVAR_BJ_ADP_L, PIN(0, 7), GPIO_OUT_LOW) /* Chipset PCH */ GPIO(EC_PCHHOT_ODL, PIN(7, 4), GPIO_INPUT) @@ -107,17 +107,17 @@ GPIO(EC_I2C_USB_C1_TCPC_SDA, PIN(F, 2), GPIO_INPUT) /* USBA */ GPIO(EN_PP5000_USBA, PIN(D, 7), GPIO_OUT_LOW) GPIO(USB_A0_OC_ODL, PIN(3, 1), GPIO_INPUT) -GPIO(USB_A1_OC_ODL, PIN(3, 0), GPIO_INPUT) -GPIO(USB_A2_OC_ODL, PIN(2, 7), GPIO_INPUT) -GPIO(USB_A3_OC_ODL, PIN(2, 6), GPIO_INPUT) +GPIO(USB_A1_OC_ODL, PIN(3, 0), GPIO_INPUT | GPIO_PULL_UP) +GPIO(USB_A2_OC_ODL, PIN(2, 7), GPIO_INPUT | GPIO_PULL_UP) +GPIO(USB_A3_OC_ODL, PIN(2, 6), GPIO_INPUT | GPIO_PULL_UP) GPIO(USB_A0_STATUS_L, PIN(2, 1), GPIO_INPUT) GPIO(USB_A1_STATUS_L, PIN(2, 0), GPIO_INPUT) GPIO(USB_A2_STATUS_L, PIN(1, 7), GPIO_INPUT) GPIO(USB_A3_STATUS_L, PIN(1, 6), GPIO_INPUT) -GPIO(USB_A_LOW_PWR0_OD, PIN(1, 5), GPIO_INPUT) -GPIO(USB_A_LOW_PWR1_OD, PIN(1, 4), GPIO_INPUT) -GPIO(USB_A_LOW_PWR2_OD, PIN(1, 1), GPIO_INPUT) -GPIO(USB_A_LOW_PWR3_OD, PIN(1, 0), GPIO_INPUT) +GPIO(USB_A_LOW_PWR0_OD, PIN(1, 5), GPIO_INPUT | GPIO_PULL_DOWN) +GPIO(USB_A_LOW_PWR1_OD, PIN(1, 4), GPIO_INPUT | GPIO_PULL_DOWN) +GPIO(USB_A_LOW_PWR2_OD, PIN(1, 1), GPIO_INPUT | GPIO_PULL_DOWN) +GPIO(USB_A_LOW_PWR3_OD, PIN(1, 0), GPIO_INPUT | GPIO_PULL_DOWN) /* LED */ /* TODO(b/197471359): LED implementation */ |