From 246370ccf78a22c168f7851636bf91ef76e85604 Mon Sep 17 00:00:00 2001
From: Udipto Goswami <ugoswami@qti.qualcomm.com>
Date: Tue, 19 Jan 2021 11:10:02 +0530
Subject: [PATCH] ARM: dts: msm: Add  pmic dependency back on Yupik

This reverts commit 36a0f1c95da5 ("ARM: dts: msm: Remove pmic
dependency on Yupik"). This was needed for Bring-up Day 0 as USB
has a dependency on ADSP for the role communication, so if role
communication fails, USB won't be able to come up in device mode.
Now that ADSP is up role communication is taking place hence this
change is not needed.

Change-Id: I2cb35f8abb146688fbb00fc5872fd9df059989fe
---
 qcom/yupik-usb.dtsi | 10 +++++++++-
 qcom/yupik.dtsi     |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/qcom/yupik-usb.dtsi b/qcom/yupik-usb.dtsi
index 474485e8348c..67b822bf441d 100644
--- a/qcom/yupik-usb.dtsi
+++ b/qcom/yupik-usb.dtsi
@@ -49,6 +49,8 @@
 			0x144 /* GSI_RING_BASE_ADDR_H */
 			0x1a4>; /* GSI_IF_STS */
 		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;
+		usb-role-switch;
+		extcon = <&eud>;
 
 		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
 		interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
@@ -73,7 +75,13 @@
 			snps,ssp-u3-u0-quirk;
 			tx-fifo-resize;
 			maximum-speed = "super-speed";
-			dr_mode = "peripheral";
+			dr_mode = "otg";
+		};
+
+		port {
+			usb_port0: endpoint {
+				remote-endpoint = <&usb_port0_connector>;
+			};
 		};
 	};
 
diff --git a/qcom/yupik.dtsi b/qcom/yupik.dtsi
index df4341dc8f48..dd36d03f8083 100644
--- a/qcom/yupik.dtsi
+++ b/qcom/yupik.dtsi
@@ -2168,6 +2168,11 @@
 
 		qcom,ucsi {
 			compatible = "qcom,ucsi-glink";
+			port {
+				usb_port0_connector: endpoint {
+					remote-endpoint = <&usb_port0>;
+				};
+			};
 		};
 
 		altmode: qcom,altmode {