From eebf6d9db7a0976384a4a9a7da6f2a802be20188 Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Wed, 6 Jun 2018 09:34:30 -0600 Subject: [PATCH] phaser: update GPIO based on newest schematics - Correct pin assignment for EN_USB_A1_5V and LED_3_L - Add TABLET_MODE_L signal although not hooking up tablet mode functionality in this CL - Remove unneeded USB-C PPC signal to port 1 since using TCPC to drive it - Clean up formatting BRANCH=none BUG=b:109747361 TEST=builds Change-Id: I40a59375c148a6d0666c71f6e5f401aba64ea95d Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/1087814 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh --- board/phaser/gpio.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/board/phaser/gpio.inc b/board/phaser/gpio.inc index 12602854bb..4d0561d847 100644 --- a/board/phaser/gpio.inc +++ b/board/phaser/gpio.inc @@ -34,6 +34,9 @@ GPIO_INT(ALL_SYS_PGOOD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) /* PM /* Other interrupts */ GPIO_INT(WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* EC_WP_ODL */ +/* TODO: Convert to GPIO_INT with tablet_mode_isr */ +GPIO(TABLET_MODE_L, PIN(8, 6), GPIO_INPUT) + /* TODO(b/74932344): Make it as an interrupt after driver supports this */ GPIO(BASE_SIXAXIS_INT_L, PIN(5, 6), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(LID_ACCEL_INT_L, PIN(5, 0), GPIO_INPUT | GPIO_SEL_1P8V) @@ -94,17 +97,15 @@ GPIO(I2C7_SDA, PIN(B, 2), GPIO_INPUT | /* USB pins */ GPIO(EN_USB_A0_5V, PIN(6, 7), GPIO_OUT_LOW) /* Enable A0 5V Charging */ -GPIO(EN_USB_A1_5V, PIN(7, 7), GPIO_OUT_LOW) /* Enable A1 5V Charging */ -GPIO(USB_A0_CHARGE_EN_L, PIN(A, 2), GPIO_OUT_HIGH) /* Enable A0 1.5A Charging */ -GPIO(USB_A1_CHARGE_EN_L, PIN(A, 0), GPIO_OUT_HIGH) /* Enable A1 1.5A Charging */ +GPIO(EN_USB_A1_5V, PIN(9, 6), GPIO_OUT_LOW) /* Enable A1 5V Charging */ +GPIO(USB_A0_CHARGE_EN_L, PIN(A, 2), GPIO_OUT_HIGH) /* Enable A0 1.5A Charging */ +GPIO(USB_A1_CHARGE_EN_L, PIN(A, 0), GPIO_OUT_HIGH) /* Enable A1 1.5A Charging */ /* USB_C0_PD_RST_L isn't connected to PIN(6,2) since ANX TCPC doesn't have reset */ GPIO(USB_C0_BC12_VBUS_ON, PIN(6, 3), GPIO_OUT_LOW) /* C0 BC1.2 Power */ GPIO(USB_C0_BC12_CHG_DET_L, PIN(9, 5), GPIO_INPUT) /* C0 BC1.2 Detect */ GPIO(USB_C0_HPD_1V8_ODL, PIN(C, 5), GPIO_INPUT | /* C0 DP Hotplug Detect */ GPIO_SEL_1P8V) GPIO(USB_C1_PD_RST_ODL, PIN(7, 0), GPIO_ODR_HIGH) /* C1 PD Reset */ -GPIO(EN_USB_C1_5V_OUT, PIN(0, 3), GPIO_OUT_LOW) /* C1 Source 5V */ -GPIO(USB_C1_CHARGE_ON, PIN(4, 0), GPIO_OUT_LOW) /* C1 Accept input voltage*/ GPIO(USB_C1_BC12_VBUS_ON, PIN(B, 1), GPIO_OUT_LOW) /* C1 BC1.2 Power */ GPIO(USB_C1_BC12_CHG_DET_L, PIN(E, 4), GPIO_INPUT) /* C1 BC1.2 Detect */ GPIO(USB_C1_HPD_1V8_ODL, PIN(C, 6), GPIO_INPUT | /* C1 DP Hotplug Detect */ @@ -114,7 +115,7 @@ GPIO(USB2_OTG_ID, PIN(8, 3), GPIO_OUT_LOW) /* OTG ID */ /* LED */ GPIO(BAT_LED_ORANGE_L, PIN(C, 3), GPIO_OUT_HIGH) /* LED_1_L */ GPIO(BAT_LED_BLUE_L, PIN(C, 4), GPIO_OUT_HIGH) /* LED_2_L */ -GPIO(LED_3_L, PIN(8, 0), GPIO_OUT_HIGH) /* LED_3_L */ +GPIO(LED_3_L, PIN(D, 7), GPIO_OUT_HIGH) /* Keyboard Backlight */ GPIO(KB_BL_PWR_EN, PIN(6, 2), GPIO_OUT_LOW)