diff options
| author | Edward Hill <ecgh@chromium.org> | 2019-08-09 14:21:49 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-12 21:56:31 +0000 |
| commit | f4f6504e1f6ea524e4703519c1c0c891a96ed0f7 (patch) | |
| tree | 6525b4f7c2c702d27f34eb584ab4d74899a64b8d | |
| parent | bdffc31c6a3dbb692229df7a5d3a58c163fe74c4 (diff) | |
| download | chrome-ec-f4f6504e1f6ea524e4703519c1c0c891a96ed0f7.tar.gz | |
Trembyle: Set GPIO pullup and voltage
Add GPIO_PULL_UP and GPIO_SEL_1P8V to GPIOs as needed.
BUG=b:138615773 b:138617417
BRANCH=none
TEST=make BOARD=trembyle
Change-Id: I80401c1cee181acc2df7fb41a5f32ea8c3076a14
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1747006
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | board/trembyle/gpio.inc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/board/trembyle/gpio.inc b/board/trembyle/gpio.inc index b284915eaa..0a4f8cf304 100644 --- a/board/trembyle/gpio.inc +++ b/board/trembyle/gpio.inc @@ -12,6 +12,8 @@ GPIO_INT(USB_C0_TCPC_INT_ODL, PIN(3, 4), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(F, 1), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_PPC_INT_ODL, PIN(6, 3), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C1_PPC_INT_ODL, PIN(D, 4), GPIO_INT_FALLING, ppc_interrupt) +GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 3), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) +GPIO_INT(USB_C1_BC12_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) GPIO_INT(PCH_SLP_S3_L, PIN(7, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PCH_SLP_S5_L, PIN(E, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(S0_PGOOD, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) @@ -20,18 +22,14 @@ GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) GPIO_INT(WP_L, PIN(5, 0), GPIO_INT_BOTH, switch_interrupt) -GPIO_INT(VOLUME_DOWN_L, PIN(A, 6), GPIO_INT_BOTH, button_interrupt) -GPIO_INT(VOLUME_UP_L, PIN(9, 5), GPIO_INT_BOTH, button_interrupt) -GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING, bmi160_interrupt) - -/* USB-C interrupts */ -GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 3), GPIO_INT_FALLING, bc12_interrupt) -GPIO_INT(USB_C1_BC12_INT_ODL, PIN(A, 4), GPIO_INT_FALLING, bc12_interrupt) +GPIO_INT(VOLUME_DOWN_L, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(VOLUME_UP_L, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) +GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING | GPIO_PULL_UP, bmi160_interrupt) /* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */ GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH) -GPIO(3AXIS_INT_L, PIN(9, 6), GPIO_INPUT) /* 3 Axis Accel */ +GPIO(3AXIS_INT_L, PIN(9, 6), GPIO_INPUT | GPIO_PULL_UP) /* 3 Axis Accel */ GPIO(CCD_MODE_ODL, PIN(C, 6), GPIO_INPUT) /* Case Closed Debug Mode */ GPIO(CPU_PROCHOT, PIN(D, 5), GPIO_ODR_HIGH) /* PROCHOT to SOC */ GPIO(EC_BATT_PRES_L, PIN(4, 1), GPIO_INPUT) /* Battery Present */ @@ -77,10 +75,10 @@ GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_USBC_AP_MUX_SCL */ GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_USBC_AP_MUX_SDA */ GPIO(I2C4_SCL, PIN(F, 3), GPIO_INPUT) /* FCH_SIC */ GPIO(I2C4_SDA, PIN(F, 2), GPIO_INPUT) /* FCH_SID */ -GPIO(I2C5_SCL, PIN(3, 3), GPIO_INPUT) /* EC_I2C_SENSOR_SCL */ -GPIO(I2C5_SDA, PIN(3, 6), GPIO_INPUT) /* EC_I2C_SENSOR_SDA */ -GPIO(I2C6_SCL, PIN(E, 4), GPIO_INPUT) /* FCH_I2C_AUDIO_SCL */ -GPIO(I2C6_SDA, PIN(E, 3), GPIO_INPUT) /* FCH_I2C_AUDIO_SDA */ +GPIO(I2C5_SCL, PIN(3, 3), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C_SENSOR_SCL */ +GPIO(I2C5_SDA, PIN(3, 6), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C_SENSOR_SDA */ +GPIO(I2C6_SCL, PIN(E, 4), GPIO_INPUT | GPIO_SEL_1P8V) /* FCH_I2C_AUDIO_SCL */ +GPIO(I2C6_SDA, PIN(E, 3), GPIO_INPUT | GPIO_SEL_1P8V) /* FCH_I2C_AUDIO_SDA */ GPIO(I2C7_SCL, PIN(B, 3), GPIO_INPUT) /* FCH_I2C_HDMI_HUB_3V3_SCL */ GPIO(I2C7_SDA, PIN(B, 2), GPIO_INPUT) /* FCH_I2C_HDMI_HUB_3V3_SDA */ |