diff --git a/qcom/sdxpinn-coresight.dtsi b/qcom/sdxpinn-coresight.dtsi
index 266bb98a..542344b9 100644
--- a/qcom/sdxpinn-coresight.dtsi
+++ b/qcom/sdxpinn-coresight.dtsi
@@ -217,6 +217,7 @@
 		atid = <78>;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
+		status = "disabled";
 
 		out-ports {
 			port {
@@ -473,6 +474,7 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,cmb-msr-skip;
+		status = "disabled";
 
 		out-ports {
 			port {
@@ -495,6 +497,7 @@
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,cmb-msr-skip;
+		status = "disabled";
 
 		out-ports {
 			port {
@@ -516,6 +519,7 @@
 		atid = <78>;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
+		status = "disabled";
 
 		out-ports {
 			port {
@@ -599,10 +603,11 @@
 		reg-names = "tpdm-base";
 
 		coresight-name = "coresight-tpdm-pcie-rscc";
-		atid = <78>;
+		atid = <88>;
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
 		qcom,cmb-msr-skip;
+		status = "disabled";
 
 		out-ports {
 			port {
@@ -666,7 +671,7 @@
 		reg-names = "tpdm-base";
 
 		status = "disabled";
-		atid = <67>;
+		atid = <87>;
 		coresight-name = "coresight-tpdm-modem-rscc";
 
 		clocks = <&aoss_qmp>;
@@ -742,6 +747,7 @@
 		coresight-name = "coresight-funnel-mvm";
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
+		status = "disabled";
 
 		in-ports {
 
@@ -1012,7 +1018,7 @@
 		qcom,tpda-atid = <67>;
 
 		qcom,dsb-elem-size = <0 32>;
-		qcom,cmb-elem-size = <0 64>;
+		qcom,cmb-elem-size = <1 64>;
 
 		coresight-name = "coresight-tpda-modem";
 
@@ -1058,9 +1064,8 @@
 
 		reg = <0x2480e000 0x1000>;
 		reg-names = "tpda-base";
-		qcom,tpda-atid = <67>;
+		qcom,tpda-atid = <87>;
 
-		qcom,dsb-elem-size = <0 32>;
 		qcom,cmb-elem-size = <0 64>;
 
 		coresight-name = "coresight-tpda-modem-rscc";
@@ -1099,10 +1104,9 @@
 
 		reg = <0x24c09000 0x1000>;
 		reg-names = "tpda-base";
-		qcom,tpda-atid = <67>;
+		qcom,tpda-atid = <88>;
 
-		qcom,dsb-elem-size = <0 32>;
-		qcom,cmb-elem-size = <0 64>;
+		qcom,cmb-elem-size = <0 8>;
 
 		coresight-name = "coresight-tpda-pcie-rscc";
 
@@ -1247,7 +1251,7 @@
 
 		qcom,dsb-elem-size = <4 32>;
 		qcom,cmb-elem-size = <0 32>,
-							<2 64>;
+							<3 64>;
 
 		in-ports {
 
@@ -1508,25 +1512,18 @@
 
 		qcom,tpda-atid = <78>;
 
-		qcom,dsb-elem-size = <0 32>,
-							<4 32>,
-							<5 32>,
-							<7 32>,
+		qcom,dsb-elem-size = <9 32>,
+							<11 32>,
 							<15 32>,
-							<17 32>,
 							<20 32>,
 							<21 32>,
-							<25 32>,
+							<23 32>,
 							<26 32>;
-		qcom,cmb-elem-size = <0 32>,
-							<7 32>,
-							<8 64>,
-							<13 64>,
-							<14 64>,
-							<16 32>,
+		qcom,cmb-elem-size = <5 32>,
 							<19 32>,
-							<22 32>,
-							<25 64>,
+							<20 32>,
+							<23 64>,
+							<24 32>,
 							<27 64>;
 
 		in-ports {
@@ -1905,7 +1902,7 @@
 
 		qcom,tpda-atid = <71>;
 
-		qcom,dsb-elem-size = <2 32>;
+		qcom,dsb-elem-size = <4 32>;
 		qcom,cmb-elem-size = <0 64>,
 							<1 64>,
 							<2 64>,