diff --git a/qcom/sun-coresight.dtsi b/qcom/sun-coresight.dtsi
index 13782c9d..59e4326d 100644
--- a/qcom/sun-coresight.dtsi
+++ b/qcom/sun-coresight.dtsi
@@ -250,7 +250,7 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
+		status = "disabled";
 
 		in-ports {
 			#address-cells = <1>;
@@ -488,7 +488,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled"; //noac
 
 		out-ports {
 			port {
@@ -510,7 +509,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled"; //noac
 
 		in-ports {
 			#address-cells = <1>;
@@ -1534,7 +1532,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -1556,7 +1553,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -1578,7 +1574,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -1597,7 +1592,6 @@
 		reg-names = "tpda-base";
 
 		coresight-name = "coresight-tpda-mm";
-		status = "disabled";//noac
 
 		qcom,cmb-elem-size = <0 32>,
 							<1 32>,
@@ -2037,10 +2031,10 @@
 		};
 	};
 
-	etm@18021000 {
+	etm@12c21000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18021000 0x1000>;
+		reg = <0x12c21000 0x1000>;
 		cpu = <&CPU0>;
 
 		coresight-name = "coresight-etm0";
@@ -2048,7 +2042,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2110,10 +2103,10 @@
 		};
 	};
 
-	replicator_ncc0_0: replicator@1b090000 {
+	replicator_ncc0_0: replicator@13490000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b090000 0x1000>;
+		reg = <0x13490000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr0_ncc0";
@@ -2122,7 +2115,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2144,44 +2136,13 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_0>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr0_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr0_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b091000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b091000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr0_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr0_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr0_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@18121000 {
+	etm@12d21000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18121000 0x1000>;
+		reg = <0x12d21000 0x1000>;
 		cpu = <&CPU1>;
 
 		coresight-name = "coresight-etm1";
@@ -2189,7 +2150,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2251,10 +2211,10 @@
 		};
 	};
 
-	replicator_ncc0_1: replicator@1b0a0000 {
+	replicator_ncc0_1: replicator@134a0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b0a0000 0x1000>;
+		reg = <0x134a0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr1_ncc0";
@@ -2262,7 +2222,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2284,44 +2243,13 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_1>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr1_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr1_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b0a1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b0a1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr1_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr1_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr1_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@18221000 {
+	etm@12e21000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18221000 0x1000>;
+		reg = <0x12e21000 0x1000>;
 		cpu = <&CPU2>;
 
 		coresight-name = "coresight-etm2";
@@ -2329,7 +2257,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2391,10 +2318,10 @@
 		};
 	};
 
-	replicator_ncc0_2: replicator@1b0b0000 {
+	replicator_ncc0_2: replicator@134b0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b0b0000 0x1000>;
+		reg = <0x134b0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr2_ncc0";
@@ -2402,7 +2329,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2424,44 +2350,13 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_2>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr2_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr2_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b0b1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b0b1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr2_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr2_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr2_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@18321000 {
+	etm@12f21000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18321000 0x1000>;
+		reg = <0x12f21000 0x1000>;
 		cpu = <&CPU3>;
 
 		coresight-name = "coresight-etm3";
@@ -2469,7 +2364,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2531,10 +2425,10 @@
 		};
 	};
 
-	replicator_ncc0_3: replicator@1b0c0000 {
+	replicator_ncc0_3: replicator@134c0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b0c0000 0x1000>;
+		reg = <0x134c0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr3_ncc0";
@@ -2542,7 +2436,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2564,44 +2457,13 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_3>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr3_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr3_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b0c1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b0c1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr3_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr3_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr3_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@18421000 {
+	etm@13021000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18421000 0x1000>;
+		reg = <0x13021000 0x1000>;
 		cpu = <&CPU4>;
 
 		coresight-name = "coresight-etm4";
@@ -2609,7 +2471,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2671,10 +2532,10 @@
 		};
 	};
 
-	replicator_ncc0_4: replicator@1b0d0000 {
+	replicator_ncc0_4: replicator@134d0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b0d0000 0x1000>;
+		reg = <0x134d0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr4_ncc0";
@@ -2682,7 +2543,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2704,44 +2564,13 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_4>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr4_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr4_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b0d1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b0d1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr4_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr4_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr4_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@18521000 {
+	etm@13121000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x18521000 0x1000>;
+		reg = <0x13121000 0x1000>;
 		cpu = <&CPU5>;
 
 		coresight-name = "coresight-etm5";
@@ -2749,7 +2578,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -2811,10 +2639,10 @@
 		};
 	};
 
-	replicator_ncc0_5: replicator@1b0e0000 {
+	replicator_ncc0_5: replicator@134e0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b0e0000 0x1000>;
+		reg = <0x134e0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr5_ncc0";
@@ -2822,7 +2650,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -2844,51 +2671,19 @@
 					<&funnel_ncc0_lv1_in_rep_ncc0_5>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr5_ncc0_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr5_ncc0>;
-				};
-			};
 		};
 	};
 
-	tmc@1b0e1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b0e1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr5_ncc0";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr5_ncc0: endpoint {
-					remote-endpoint =
-					<&rep_etr5_ncc0_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	funnel_ncc0_lv1: funnel@1b081000 {
+	funnel_ncc0_lv1: funnel@13481000  {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb908>;
-		reg = <0x1b081000 0x1000>;
+		reg = <0x13481000 0x1000>;
 		reg-names = "funnel-base";
 
 		coresight-name = "coresight-funnel-ncc0_lv1";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			#address-cells = <1>;
@@ -2970,17 +2765,16 @@
 		};
 	};
 
-	uc0_etf: tmc@1b011000 {
+	uc0_etf: tmc@13411000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b011000 0x1000>;
+		reg = <0x13411000 0x1000>;
 		reg-names = "tmc-base";
 
 		coresight-name = "coresight-tmc-etf-uc0";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3001,10 +2795,10 @@
 		};
 	};
 
-	replicator_uc0: replicator@1b0a0000 {
+	replicator_uc0: replicator@134a0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b00a000 0x1000>;
+		reg = <0x1340a000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-uc0";
@@ -3012,7 +2806,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3037,17 +2830,16 @@
 		};
 	};
 
-	funnel_ncc0_lv2: funnel@1b001000 {
+	funnel_ncc0_lv2: funnel@13401000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb908>;
-		reg = <0x1b001000 0x1000>;
+		reg = <0x13401000 0x1000>;
 		reg-names = "funnel-base";
 
 		coresight-name = "coresight-funnel-ncc0_lv2";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			#address-cells = <1>;
@@ -3080,17 +2872,16 @@
 		};
 	};
 
-	ncc_etf: tmc@1b009000 {
+	ncc_etf: tmc@13409000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b009000 0x1000>;
+		reg = <0x13409000 0x1000>;
 		reg-names = "tmc-base";
 
 		coresight-name = "coresight-tmc-etf_ncc0";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-                status = "disabled";
 
 		in-ports {
 			port {
@@ -3111,10 +2902,10 @@
 		};
 	};
 
-	etm@19021000 {
+	etm@13521000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x19021000 0x1000>;
+		reg = <0x13521000 0x1000>;
 		cpu = <&CPU6>;
 
 		coresight-name = "coresight-etm6";
@@ -3122,7 +2913,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -3184,10 +2974,10 @@
 		};
 	};
 
-	replicator_ncc1_0: replicator@1b190000 {
+	replicator_ncc1_0: replicator@13d90000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b190000 0x1000>;
+		reg = <0x13d90000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr0_ncc1";
@@ -3195,7 +2985,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3217,44 +3006,13 @@
 					<&funnel_ncc1_lv1_in_rep_ncc1_0>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr6_ncc1_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr6_ncc1>;
-				};
-			};
 		};
 	};
 
-	tmc@1b191000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b191000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr0_ncc1";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr6_ncc1: endpoint {
-					remote-endpoint =
-					<&rep_etr6_ncc1_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-	etm@19121000 {
+	etm@13621000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb95d>;
-		reg = <0x19121000 0x1000>;
+		reg = <0x13621000 0x1000>;
 		cpu = <&CPU7>;
 
 		coresight-name = "coresight-etm7";
@@ -3262,7 +3020,6 @@
 		qcom,skip-power-up;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		out-ports {
 			port {
@@ -3324,10 +3081,10 @@
 		};
 	};
 
-	replicator_ncc1_1: replicator@1b1a0000 {
+	replicator_ncc1_1: replicator@13da0000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b1a0000 0x1000>;
+		reg = <0x13da0000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-etr1_ncc1";
@@ -3335,7 +3092,6 @@
 		qcom,replicator-loses-context;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3357,52 +3113,19 @@
 					<&funnel_ncc1_lv1_in_rep_ncc1_1>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				rep_etr7_ncc1_out_ncc_etr: endpoint {
-					remote-endpoint =
-					<&ncc_etr_in_rep_etr7_ncc1>;
-				};
-			};
 		};
 	};
 
-	tmc@1b1a1000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b1a1000 0x1000>;
-		reg-names = "tmc-base";
-
-		coresight-name = "coresight-tmc-etr1_ncc1";
-
-		arm,scatter-gather;
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";
-
-		in-ports {
-			port {
-				ncc_etr_in_rep_etr7_ncc1: endpoint {
-					remote-endpoint =
-					<&rep_etr7_ncc1_out_ncc_etr>;
-				};
-			};
-		};
-	};
-
-
-	funnel_ncc1_lv1: funnel@1b181000 {
+	funnel_ncc1_lv1: funnel@13d81000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb908>;
-		reg = <0x1b181000 0x1000>;
+		reg = <0x13d81000 0x1000>;
 		reg-names = "funnel-base";
 
 		coresight-name = "coresight-funnel-ncc1_lv1";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			#address-cells = <1>;
@@ -3452,17 +3175,16 @@
 		};
 	};
 
-	uc1_etf: tmc@1b108000 {
+	uc1_etf: tmc@13d08000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b108000 0x1000>;
+		reg = <0x13d08000 0x1000>;
 		reg-names = "tmc-base";
 
 		coresight-name = "coresight-tmc-etf-uc1";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3483,10 +3205,10 @@
 		};
 	};
 
-	replicator_uc1: replicator@1b10a000 {
+	replicator_uc1: replicator@13d0a000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb909>;
-		reg = <0x1b10a000 0x1000>;
+		reg = <0x13d0a000 0x1000>;
 		reg-names = "replicator-base";
 
 		coresight-name = "coresight-replicator-uc1";
@@ -3519,17 +3241,16 @@
 		};
 	};
 
-	funnel_ncc1_lv2: funnel@1b101000 {
+	funnel_ncc1_lv2: funnel@13d01000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb908>;
-		reg = <0x1b101000 0x1000>;
+		reg = <0x13d01000 0x1000>;
 		reg-names = "funnel-base";
 
 		coresight-name = "coresight-funnel-ncc1_lv2";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			#address-cells = <1>;
@@ -3565,14 +3286,13 @@
 	tmc@1b109000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb961>;
-		reg = <0x1b109000 0x1000>;
+		reg = <0x13d09000 0x1000>;
 		reg-names = "tmc-base";
 
 		coresight-name = "coresight-tmc-etf_ncc1";
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";
 
 		in-ports {
 			port {
@@ -3649,44 +3369,9 @@
 
 		out-ports {
 			port {
-				tpdm_ddr_lpi_out_tn_ddr_lpi: endpoint {
+				tpdm_ddr_lpi_out_funnel_aoss: endpoint {
 					remote-endpoint =
-					<&tn_ddr_lpi_in_tpdm_ddr_lpi>;
-				};
-			};
-		};
-	};
-
-	ddr_lpi_tn: TN@10b30000 {
-		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x000f0c00>;
-		reg = <0x10b30000 0x3a00>;
-		reg-names = "traceNoc-base";
-
-		coresight-name = "coresight-tracenoc-ddr-lpi";
-
-		clocks = <&aoss_qmp>;
-		clock-names = "apb_pclk";
-		status = "disabled";//noac
-
-		in-ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-				tn_ddr_lpi_in_tpdm_ddr_lpi: endpoint {
-					remote-endpoint =
-					<&tpdm_ddr_lpi_out_tn_ddr_lpi>;
-				};
-			};
-		};
-
-		out-ports {
-			port {
-				tn_ddr_lpi_out_funnel_aoss: endpoint {
-					remote-endpoint =
-					<&funnel_aoss_in_tn_ddr_lpi>;
+					<&funnel_aoss_in_tpdm_ddr_lpi>;
 				};
 			};
 		};
@@ -4375,7 +4060,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4397,7 +4081,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4419,7 +4102,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4441,7 +4123,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4463,7 +4144,7 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
+
 		out-ports {
 			port {
 				tpdm_pmu_out_tn_ag: endpoint {
@@ -4484,7 +4165,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4506,7 +4186,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -4528,7 +4207,6 @@
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
 
 		out-ports {
 			port {
@@ -5111,9 +4789,9 @@
 
 			port@3 {
 				reg = <3>;
-				funnel_aoss_in_tn_ddr_lpi: endpoint {
+				funnel_aoss_in_tpdm_ddr_lpi: endpoint {
 					remote-endpoint =
-					<&tn_ddr_lpi_out_funnel_aoss>;
+					<&tpdm_ddr_lpi_out_funnel_aoss>;
 				};
 			};
 
@@ -5634,7 +5312,7 @@
 		qcom,extended_cti;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
-		status = "disabled";//noac
+		status = "disabled";
 	};
 
 	cti@10d05000 {
@@ -5865,7 +5543,6 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,extended_cti;
-		status = "disabled";//noac
 	};
 
 	cti@109a1000 {
@@ -5878,7 +5555,6 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,extended_cti;
-		status = "disabled";//noac
 	};
 
 	cti@109a2000 {
@@ -5891,7 +5567,6 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,extended_cti;
-		status = "disabled";//noac
 	};
 
 	cti@109c1000 {
@@ -5904,7 +5579,6 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,extended_cti;
-		status = "disabled";//noac
 	};
 
 	cti@10ba5000 {
@@ -5917,7 +5591,6 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,extended_cti;
-		status = "disabled";//noac
 	};
 
 	cti@10831000 {