diff --git a/qcom/lahaina-usb.dtsi b/qcom/lahaina-usb.dtsi
index b50b21854538..946a4e6b96c9 100644
--- a/qcom/lahaina-usb.dtsi
+++ b/qcom/lahaina-usb.dtsi
@@ -46,6 +46,8 @@
 			0x144 /* GSI_RING_BASE_ADDR_H */
 			0x1a4>; /* GSI_IF_STS */
 		qcom,dwc-usb3-msm-tx-fifo-size = <27696>;
+		usb-role-switch;
+		extcon = <&eud>;
 
 		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
 		interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
@@ -68,7 +70,7 @@
 			usb-core-id = <0>;
 			tx-fifo-resize;
 			maximum-speed = "super-speed-plus";
-			dr_mode = "peripheral";
+			dr_mode = "otg";
 		};
 
 		qcom,usbbam@a704000 {
@@ -99,6 +101,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 725d63d7e76b..1e8a691739bc 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -3775,6 +3775,11 @@
 
 		qcom,ucsi {
 			compatible = "qcom,ucsi-glink";
+			port {
+				usb_port0_connector: endpoint {
+					remote-endpoint = <&usb_port0>;
+				};
+			};
 		};
 
 		qcom,altmode {