diff --git a/qcom/lahaina-usb.dtsi b/qcom/lahaina-usb.dtsi
index b50b21854538..f140a425e78d 100644
--- a/qcom/lahaina-usb.dtsi
+++ b/qcom/lahaina-usb.dtsi
@@ -46,6 +46,7 @@
 			0x144 /* GSI_RING_BASE_ADDR_H */
 			0x1a4>; /* GSI_IF_STS */
 		qcom,dwc-usb3-msm-tx-fifo-size = <27696>;
+		usb-role-switch;
 
 		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
 		interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
@@ -99,6 +100,12 @@
 				qcom,descriptor-fifo-size = <0x800>;
 			};
 		};
+
+		port {
+			usb_port0: endpoint {
+				remote-endpoint = <&usb_port0_connector>;
+			};
+		};
 	};
 
 	/* Primary USB port related High Speed PHY */
diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index 03580c92d14e..7db97cd1534b 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -3718,6 +3718,11 @@
 
 		qcom,ucsi {
 			compatible = "qcom,ucsi-glink";
+			port {
+				usb_port0_connector: endpoint {
+					remote-endpoint = <&usb_port0>;
+				};
+			};
 		};
 
 		qcom,altmode {