diff --git a/qcom/waipio-lemur.dtsi b/qcom/waipio-lemur.dtsi
index 11e4cc8e..4d3ee64b 100644
--- a/qcom/waipio-lemur.dtsi
+++ b/qcom/waipio-lemur.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/interconnect/qcom,waipio.h>
+
 &mdm0 {
 	compatible = "qcom,ext-lemur";
 	qcom,mdm-link-info = "0308_01.01.00";
@@ -7,11 +9,6 @@
 	status = "disabled";
 };
 
-&mhi0 {
-	esoc-names = "mdm";
-	esoc-0 = <&mdm0>;
-};
-
 &pcie1 {
 	qcom,target-link-width = <1>; /* force X1 lane width */
 	qcom,no-l0s-supported;
@@ -187,3 +184,37 @@
 	qcom,ram-collection-on-crash;
 	qcom,secure-debug-check-action = <0>;
 };
+
+&pcie1_rp {
+	#address-cells = <5>;
+	#size-cells = <0>;
+
+	mhi0: qcom,mhi@0 {
+		reg = <0 0 0 0 0 >;
+
+		esoc-names = "mdm";
+		esoc-0 = <&mdm0>;
+
+		interconnects = <&pcie_noc MASTER_PCIE_1 &mc_virt SLAVE_EBI1>;
+		interconnect-names = "pcie_to_ddr";
+
+		qcom,mhi-bus-bw-cfg =
+		<0 0>, /* no vote */
+		<250000 0>, /* avg bw / AB: 2 GBps, peak bw / IB: no vote */
+		<500000 0>, /* avg bw / AB: 4 GBps, peak bw / IB: no vote */
+		<1000000 0>, /* avg bw / AB: 8 GBps, peak bw / IB: no vote */
+		<2000000 0>; /* avg bw / AB: 16 GBps, peak bw / IB: no vote */
+
+		qcom,iommu-group = <&mhi0_iommu_group>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		mhi0_iommu_group: mhi0_iommu_group {
+			qcom,iommu-msi-size = <0x1000>;
+			qcom,iommu-dma-addr-pool = <0x20000000 0x0fffffff>;
+			qcom,iommu-dma = "fastmap";
+			qcom,iommu-pagetable = "coherent";
+		};
+	};
+};
diff --git a/qcom/waipio.dtsi b/qcom/waipio.dtsi
index ebc3bcab..5bc55d47 100644
--- a/qcom/waipio.dtsi
+++ b/qcom/waipio.dtsi
@@ -3616,34 +3616,3 @@
 		reg = <0x42>;
 	};
 };
-
-&pcie1_rp {
-	#address-cells = <5>;
-	#size-cells = <0>;
-
-	mhi0: qcom,mhi@0 {
-		reg = <0 0 0 0 0 >;
-
-		interconnects = <&pcie_noc MASTER_PCIE_1 &mc_virt SLAVE_EBI1>;
-		interconnect-names = "pcie_to_ddr";
-
-		qcom,mhi-bus-bw-cfg =
-		<0 0>, /* no vote */
-		<250000 0>, /* avg bw / AB: 2 GBps, peak bw / IB: no vote */
-		<500000 0>, /* avg bw / AB: 4 GBps, peak bw / IB: no vote */
-		<1000000 0>, /* avg bw / AB: 8 GBps, peak bw / IB: no vote */
-		<2000000 0>; /* avg bw / AB: 16 GBps, peak bw / IB: no vote */
-
-		qcom,iommu-group = <&mhi0_iommu_group>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		mhi0_iommu_group: mhi0_iommu_group {
-			qcom,iommu-msi-size = <0x1000>;
-			qcom,iommu-dma-addr-pool = <0x20000000 0x0fffffff>;
-			qcom,iommu-dma = "fastmap";
-			qcom,iommu-pagetable = "coherent";
-		};
-	};
-};