summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZick Wei <zick.wei@quanta.corp-partner.google.com>2020-07-20 10:16:36 +0800
committerCommit Bot <commit-bot@chromium.org>2020-07-21 05:46:57 +0000
commiteda8f40a9886eb209cf93c5f959ab0e46594e620 (patch)
treef6eaa5f8bb3007afce7ec84ba097775cbe911644
parentf67e66aea604111d15199d1a86d8b8720d907fc8 (diff)
downloadchrome-ec-eda8f40a9886eb209cf93c5f959ab0e46594e620.tar.gz
berknip: Allow MST hub to control HPD for OPT3 DB
Use an UNIMPLEMENTED GPIO for PORT_TO_HPD so that EC does not drive HPD for OPT3 DB. BUG=b:161105355 BRANCH=none TEST=HDMI/DP works on OPT3 DB. Signed-off-by: Zick Wei <zick.wei@quanta.corp-partner.google.com> Change-Id: I4f6ca8e9a74f18489c6ca20d2f10e9a6840719e0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2306891 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r--board/berknip/board.h4
-rw-r--r--board/berknip/gpio.inc5
2 files changed, 6 insertions, 3 deletions
diff --git a/board/berknip/board.h b/board/berknip/board.h
index 9cd31b4f85..26d402dbae 100644
--- a/board/berknip/board.h
+++ b/board/berknip/board.h
@@ -205,8 +205,8 @@ static inline bool ec_config_has_hdmi_conn_hpd(void)
#define PORT_TO_HPD(port) ((port == 0) \
? GPIO_USB_C0_HPD \
- : (ec_config_has_usbc1_retimer_ps8743()) \
- ? GPIO_DP1_HPD \
+ : (ec_config_has_mst_hub_rtd2141b()) \
+ ? GPIO_NO_HPD \
: GPIO_DP2_HPD)
extern const struct usb_mux usbc1_tusb544;
diff --git a/board/berknip/gpio.inc b/board/berknip/gpio.inc
index 2996086212..be26fa1595 100644
--- a/board/berknip/gpio.inc
+++ b/board/berknip/gpio.inc
@@ -48,10 +48,13 @@ GPIO(USB_C0_TCPC_RST_L, PIN(E, 1), GPIO_OUT_HIGH) /* C0 TCPC Reset */
GPIO(USB_C1_TCPC_RST_L, PIN(F, 0), GPIO_OUT_HIGH) /* C1 TCPC Reset */
GPIO(USB_C0_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */
GPIO(USB_C0_IN_HPD, PIN(7, 3), GPIO_OUT_LOW) /* C0 IN Hotplug Detect */
-GPIO(DP1_HPD, PIN(F, 4), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */
+GPIO(EC_DP1_HPD, PIN(F, 4), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */
GPIO(DP2_HPD, PIN(C, 1), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */
+GPIO(DP1_HPD_EC_IN, PIN(7, 5), GPIO_INPUT) /* C1 IN Hotplug Detect */
GPIO(EC_H1_PACKET_MODE, PIN(8, 6), GPIO_OUT_LOW) /* H1 Packet Mode */
+UNIMPLEMENTED(NO_HPD)
+
UNIMPLEMENTED(PCH_SMI_L)
GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_HIGH)