diff --git a/qcom/msm-arm-smmu-qrb2210-rb1.dtsi b/qcom/msm-arm-smmu-qrb2210-rb1.dtsi
index 9bd8921aef7a..39747390a54a 100644
--- a/qcom/msm-arm-smmu-qrb2210-rb1.dtsi
+++ b/qcom/msm-arm-smmu-qrb2210-rb1.dtsi
@@ -124,10 +124,10 @@
 					<GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
 					<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
 					<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-				qcom,msm-bus,name = "apps_smmu";
-				qcom,msm-bus,num-cases = <2>;
-				qcom,msm-bus,active-only;
-				qcom,msm-bus,num-paths = <1>;
+
+				interconnects = <&bimc MASTER_AMPSS_M0
+						&system_noc SLAVE_TCU>;
+				qcom,active-only;
 
 				qcom,actlr =
 					/* For rt TBU +3 deep PF */
@@ -142,10 +142,11 @@
 					reg-names = "base", "status-reg";
 					qcom,stream-id-range = <0x0 0x400>;
 					interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-					qcom,msm-bus,name = "apps_smmu";
-					qcom,msm-bus,num-cases = <2>;
-					qcom,msm-bus,active-only;
-					qcom,msm-bus,num-paths = <2>;
+					interconnects = <&bimc MASTER_AMPSS_M0
+							&config_noc SLAVE_IMEM_CFG>,
+							<&bimc MASTER_AMPSS_M0
+							&system_noc SLAVE_TCU>;
+					qcom,active-only;
 
 				};
 
@@ -155,14 +156,14 @@
 						<0xc782208 0x8>;
 					reg-names = "base", "status-reg";
 					qcom,stream-id-range = <0x400 0x400>;
-					interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
 					qcom,regulator-names = "vdd";
 					vdd-supply = <&hlos1_vote_mm_snoc_mmu_tbu_rt_gdsc>;
-					qcom,msm-bus,name = "apps_smmu";
-					qcom,msm-bus,num-cases = <2>;
-					qcom,msm-bus,active-only;
-					qcom,msm-bus,num-paths = <2>;
-
+					interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+					interconnects = <&mmrt_virt MASTER_MDP_PORT0
+							&bimc SLAVE_EBI_CH0>,
+							<&bimc MASTER_AMPSS_M0
+							&system_noc SLAVE_TCU>;
+					qcom,active-only;
 				};
 
 				mm_nrt_tbu: mm_nrt_tbu@0xc78d000 {
@@ -171,14 +172,14 @@
 						<0xc782210 0x8>;
 					reg-names = "base", "status-reg";
 					qcom,stream-id-range = <0x800 0x400>;
-					interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
 					qcom,regulator-names = "vdd";
 					vdd-supply = <&hlos1_vote_mm_snoc_mmu_tbu_nrt_gdsc>;
-					qcom,msm-bus,name = "apps_smmu";
-					qcom,msm-bus,num-cases = <2>;
-					qcom,msm-bus,active-only;
-					qcom,msm-bus,num-paths = <2>;
-
+					interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+					interconnects = <&mmnrt_virt MASTER_CAMNOC_SF
+							&bimc SLAVE_EBI_CH0>,
+							<&bimc MASTER_AMPSS_M0
+							&system_noc SLAVE_TCU>;
+					qcom,active-only;
 				};
 
 	};
diff --git a/qcom/qrb2210-rb1.dtsi b/qcom/qrb2210-rb1.dtsi
index 89dee2890d18..8538e991b26d 100644
--- a/qcom/qrb2210-rb1.dtsi
+++ b/qcom/qrb2210-rb1.dtsi
@@ -1289,6 +1289,44 @@ dcc: dcc_v2@1be2000 {
 					  "qcom,smp2p-early-crash-ind";
 		};
 	};
+
+	clk_virt: interconnect {
+		compatible = "qcom,scuba-clk_virt";
+		#interconnect-cells = <1>;
+	};
+
+	mmnrt_virt: interconnect@0 {
+		compatible = "qcom,scuba-mmnrt_virt";
+		#interconnect-cells = <1>;
+	};
+
+	mmrt_virt: interconnect@1 {
+		compatible = "qcom,scuba-mmrt_virt";
+		#interconnect-cells = <1>;
+	};
+
+	system_noc: interconnect@1880000 {
+		reg = <0x01880000 0x60200>;
+		compatible = "qcom,scuba-system_noc";
+		#interconnect-cells = <1>;
+	};
+
+	config_noc: interconnect@1900000 {
+		reg = <0x01900000 0x8200>;
+		compatible = "qcom,scuba-config_noc";
+		#interconnect-cells = <1>;
+	};
+
+	bimc: interconnect@4480000 {
+		reg = <0x04480000 0x80000>;
+		compatible = "qcom,scuba-bimc";
+		#interconnect-cells = <1>;
+	};
+
+	qcom-secure-buffer {
+		compatible = "qcom,secure-buffer";
+	};
+
 };
 
 #include "pm2250.dtsi"
@@ -1584,3 +1622,7 @@ dcc: dcc_v2@1be2000 {
 		};
 	};
 };
+
+&qupv3_se4_2uart {
+	status = "ok";
+};