From 2befbf878db0d4a51349eac629d9a61e5459d2aa Mon Sep 17 00:00:00 2001 From: Scott Collyer Date: Wed, 24 Apr 2019 11:46:04 -0700 Subject: hatch/kohaku: Account for TCPC reset polarity in ALERT handler Reset polarity was added to tcpc_config so that the reset function could be common across different boards which have different TCPC selections. This was applied to pd_reset_mcu(), however, that CL did not take into account the reset polarity in the tcpc_get_alert_status function. This CL fixes that oversight. In addition, this CL fixes the name for kohaku's port 0 TCPC reset line to match the schematic. BUG=b:130194031 BRANCH=none TEST=verified on Hatch that both ports 0/1 function correctly. Change-Id: I0d75d3655c799d4c74f4a6fb1805c06c1fe99c06 Signed-off-by: Scott Collyer Reviewed-on: https://chromium-review.googlesource.com/1582964 Commit-Ready: Scott Collyer Tested-by: Scott Collyer Reviewed-by: Furquan Shaikh --- board/kohaku/board.h | 2 ++ board/kohaku/gpio.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'board/kohaku') diff --git a/board/kohaku/board.h b/board/kohaku/board.h index 7ef5f208de..558293f7a3 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -72,6 +72,8 @@ #define BOARD_TCPC_C0_RESET_POST_DELAY 0 #define BOARD_TCPC_C1_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS #define BOARD_TCPC_C1_RESET_POST_DELAY 0 +#define GPIO_USB_C0_TCPC_RST GPIO_USB_C0_TCPC_RST_ODL +#define GPIO_USB_C1_TCPC_RST GPIO_USB_C1_TCPC_RST_ODL /* BC 1.2 */ #define CONFIG_BC12_DETECT_MAX14637 diff --git a/board/kohaku/gpio.inc b/board/kohaku/gpio.inc index c695faad93..9e0e06fa30 100644 --- a/board/kohaku/gpio.inc +++ b/board/kohaku/gpio.inc @@ -58,7 +58,7 @@ GPIO(EC_INT_L, PIN(7, 0), GPIO_OUT_HIGH) /* USB and USBC Signals */ GPIO(USB_C_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) -GPIO(USB_C0_TCPC_RST, PIN(9, 7), GPIO_OUT_LOW) +GPIO(USB_C0_TCPC_RST_ODL, PIN(9, 7), GPIO_ODR_HIGH) GPIO(USB_C1_TCPC_RST_ODL, PIN(3, 2), GPIO_ODR_HIGH) GPIO(USB_C0_BC12_CHG_DET_L, PIN(0, 6), GPIO_INPUT) GPIO(USB_C1_BC12_CHG_DET_L, PIN(3, 5), GPIO_INPUT) -- cgit v1.2.1