diff --git a/qcom/waipio-cdp.dtsi b/qcom/waipio-cdp.dtsi
index 228f5ac0..37abc709 100644
--- a/qcom/waipio-cdp.dtsi
+++ b/qcom/waipio-cdp.dtsi
@@ -255,3 +255,28 @@
 		pinctrl-2 = <&ts_release>;
 	};
 };
+
+&usb0 {
+	usb-role-switch;
+
+	dwc3@a600000 {
+		usb-role-switch;
+		dr_mode = "otg";
+	};
+
+	port {
+		usb_port0: endpoint {
+			remote-endpoint = <&usb_port0_connector>;
+		};
+	};
+};
+
+&ucsi {
+	connector {
+		port {
+			usb_port0_connector: endpoint {
+				remote-endpoint = <&usb_port0>;
+			};
+		};
+	};
+};
diff --git a/qcom/waipio-mtp.dtsi b/qcom/waipio-mtp.dtsi
index dabbfaa9..5b38c2b0 100644
--- a/qcom/waipio-mtp.dtsi
+++ b/qcom/waipio-mtp.dtsi
@@ -152,3 +152,28 @@
 		pinctrl-2 = <&ts_release>;
 	};
 };
+
+&usb0 {
+	usb-role-switch;
+
+	dwc3@a600000 {
+		usb-role-switch;
+		dr_mode = "otg";
+	};
+
+	port {
+		usb_port0: endpoint {
+			remote-endpoint = <&usb_port0_connector>;
+		};
+	};
+};
+
+&ucsi {
+	connector {
+		port {
+			usb_port0_connector: endpoint {
+				remote-endpoint = <&usb_port0>;
+			};
+		};
+	};
+};
diff --git a/qcom/waipio-qrd.dtsi b/qcom/waipio-qrd.dtsi
index 0f42e07d..53bae3e0 100644
--- a/qcom/waipio-qrd.dtsi
+++ b/qcom/waipio-qrd.dtsi
@@ -247,3 +247,27 @@
 	};
 };
 
+&usb0 {
+	usb-role-switch;
+
+	dwc3@a600000 {
+		usb-role-switch;
+		dr_mode = "otg";
+	};
+
+	port {
+		usb_port0: endpoint {
+			remote-endpoint = <&usb_port0_connector>;
+		};
+	};
+};
+
+&ucsi {
+	connector {
+		port {
+			usb_port0_connector: endpoint {
+				remote-endpoint = <&usb_port0>;
+			};
+		};
+	};
+};
diff --git a/qcom/waipio-usb.dtsi b/qcom/waipio-usb.dtsi
index 1dbadaf4..47ef202b 100644
--- a/qcom/waipio-usb.dtsi
+++ b/qcom/waipio-usb.dtsi
@@ -39,6 +39,11 @@
 			0x1a4>; /* GSI_IF_STS */
 		qcom,dwc-usb3-msm-tx-fifo-size = <27696>;
 
+		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
+		interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
+				<&aggre1_noc MASTER_USB3_0 &config_noc SLAVE_IPA_CFG>,
+				<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3_0>;
+
 		dwc3@a600000 {
 			compatible = "snps,dwc3";
 			reg = <0xa600000 0xd93c>;
diff --git a/qcom/waipio.dtsi b/qcom/waipio.dtsi
index 7c3e8209..4d994240 100644
--- a/qcom/waipio.dtsi
+++ b/qcom/waipio.dtsi
@@ -1356,7 +1356,7 @@
 			compatible = "qcom,battery-charger";
 		};
 
-		qcom,ucsi {
+		ucsi: qcom,ucsi {
 			compatible = "qcom,ucsi-glink";
 		};