diff --git a/qcom/pineapple-mtp.dtsi b/qcom/pineapple-mtp.dtsi
index 64afa9fc..11e08837 100644
--- a/qcom/pineapple-mtp.dtsi
+++ b/qcom/pineapple-mtp.dtsi
@@ -186,6 +186,25 @@
 	usb-repeater = <&pm8550b_eusb2_repeater>;
 };
 
+&usb0 {
+	usb-role-switch;
+	port {
+		usb_port0: endpoint {
+			remote-endpoint = <&usb_port0_connector>;
+		};
+	};
+};
+
+&ucsi {
+	connector {
+		port {
+			usb_port0_connector: endpoint {
+				remote-endpoint = <&usb_port0>;
+			};
+		};
+	};
+};
+
 &qupv3_se4_spi {
 	#address-cells = <1>;
 	#size-cells = <0>;
diff --git a/qcom/pineapple-qrd.dtsi b/qcom/pineapple-qrd.dtsi
index 022eac1b..00c4b057 100644
--- a/qcom/pineapple-qrd.dtsi
+++ b/qcom/pineapple-qrd.dtsi
@@ -355,10 +355,6 @@
 		 0x00 0x59>;
 };
 
-&usb0 {
-	usb-role-switch;
-};
-
 &qupv3_se6_i2c {
 	status = "ok";
 
@@ -405,6 +401,25 @@
 	gpios = <&tlmm 29 0>;
 
 	ssusb_redriver = <&redriver>;
+
+	qcom,wcd_usbss = <&wcd_usbss>;
+
+	usb-role-switch;
+	port {
+		usb_port0: endpoint {
+			remote-endpoint = <&usb_port0_connector>;
+		};
+	};
+};
+
+&ucsi {
+	connector {
+		port {
+			usb_port0_connector: endpoint {
+				remote-endpoint = <&usb_port0>;
+			};
+		};
+	};
 };
 
 &regulator_ocp_notifier {
diff --git a/qcom/pineapple-usb.dtsi b/qcom/pineapple-usb.dtsi
index 418e1d0b..db18a668 100644
--- a/qcom/pineapple-usb.dtsi
+++ b/qcom/pineapple-usb.dtsi
@@ -80,6 +80,7 @@
 			tx-fifo-resize;
 			dr_mode = "otg";
 			maximum-speed = "super-speed-plus";
+			usb-role-switch;
 		};
 	};