diff --git a/qcom/tuna-rumi.dtsi b/qcom/tuna-rumi.dtsi
index 6c23a664..6b1696a9 100644
--- a/qcom/tuna-rumi.dtsi
+++ b/qcom/tuna-rumi.dtsi
@@ -15,9 +15,6 @@
 };
 
 &soc {
-	usb_nop_phy: usb_nop_phy {
-		compatible = "usb-nop-xceiv";
-	};
 
 	usb_emuphy: phy@a784000 {
 		compatible = "qcom,usb-emu-phy";
diff --git a/qcom/tuna-usb.dtsi b/qcom/tuna-usb.dtsi
index e9733a1a..e260f53d 100644
--- a/qcom/tuna-usb.dtsi
+++ b/qcom/tuna-usb.dtsi
@@ -90,6 +90,12 @@
 			maximum-speed = "super-speed-plus";
 			usb-role-switch;
 		};
+
+		port {
+			usb_port0: endpoint {
+				remote-endpoint = <&usb_port0_connector>;
+			};
+		};
 	};
 
 	dwc3_mem_region: dwc3_mem_region {
diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index 47ce3606..7d27f19e 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -2608,6 +2608,13 @@
 
 		ucsi: qcom,ucsi {
 			compatible = "qcom,ucsi-glink";
+			connector {
+				port {
+					usb_port0_connector: endpoint {
+					remote-endpoint = <&usb_port0>;
+					};
+				};
+			};
 		};
 
 		altmode: qcom,altmode {