diff --git a/qcom/monaco-coresight.dtsi b/qcom/monaco-coresight.dtsi
index 1fc8403e..afb072f1 100644
--- a/qcom/monaco-coresight.dtsi
+++ b/qcom/monaco-coresight.dtsi
@@ -4,15 +4,6 @@
  */
 
 &soc {
-	hwevent {
-		/* compatible = "qcom,coresight-hwevent"; */
-
-		coresight-name = "coresight-hwevent";
-		coresight-csr = <&csr>;
-		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
-		clock-names = "apb_pclk";
-	};
-
 	apss_tgu: tgu@9900000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x0003b999>;
@@ -69,6 +60,7 @@
 		reg-names = "stm-base", "stm-stimulus-base";
 
 		coresight-name = "coresight-stm";
+		atid = <16>;
 
 		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;
 		clock-names = "apb_pclk";
@@ -124,9 +116,10 @@
 	};
 
 	modem_rfxe: modem_rfxe {
-		/* compatible = "qcom,coresight-dummy"; */
+		compatible = "arm,coresight-dummy-source";
+
 		coresight-name = "coresight-modem-rfxe";
-		qcom,dummy-source;
+		atid = <50>;
 		out-ports {
 			port {
 				modem_rxfe_out_funnel_in1: endpoint {
@@ -141,22 +134,48 @@
 		compatible = "qcom,coresight-remote-etm";
 		coresight-name = "coresight-audio-etm0";
 
-		qcom,inst-id = <5>;
+		atid = <40>;
+
 		out-ports {
-			port {
+			port@0 {
+				reg = <0>;
 				audio_etm0_out_funnel_lpass: endpoint {
 					remote-endpoint =
 					<&funnel_lpass_in_audio_etm0>;
 				};
 			};
+
+			port@1 {
+				reg = <1>;
+				audio_etm0_out_qmi: endpoint {
+					remote-endpoint =
+					<&qmi_in_audio_etm0>;
+				};
+			};
+		};
+	};
+
+	audio-qmi {
+		compatible = "qcom,coresight-qmi";
+
+		coresight-name = "coresight-qmi-auido";
+		qcom,inst-id = <5>;
+
+		in-ports {
+			port {
+				qmi_in_audio_etm0: endpoint {
+					remote-endpoint =
+						<&audio_etm0_out_qmi>;
+				};
+			};
 		};
 	};
 
 	snoc: snoc {
-		/* compatible = "qcom,coresight-dummy"; */
+		compatible = "arm,coresight-dummy-source";
 		coresight-name = "coresight-snoc";
 
-		qcom,dummy-source;
+		atid = <125>;
 
 		out-ports {
 			port {
@@ -169,10 +188,10 @@
 	};
 
 	tpdm_lpass: tpdm@8a26000 {
-		/* compatible = "qcom,coresight-dummy"; */
+		compatible = "arm,coresight-dummy-source";
 
 		coresight-name = "coresight-tpdm-lpass";
-		qcom,dummy-source;
+		atid = <26>;
 		out-ports {
 			port {
 				tpdm_lpass_out_funnel_lpass: endpoint {
@@ -447,9 +466,9 @@
 	};
 
 	tpdm_wcss: tpdm@899c000 {
-		/* compatible = "qcom,coresight-dummy"; */
+		compatible = "arm,coresight-dummy-source";
 		coresight-name = "coresight-tpdm-wcss";
-		qcom,dummy-source;
+		atid = <67>;
 
 		out-ports {
 			port {
@@ -491,15 +510,40 @@
 		compatible = "qcom,coresight-remote-etm";
 		coresight-name = "coresight-modem-etm0";
 
-		qcom,inst-id = <2>;
+		atid = <36>;
 
 		out-ports {
-			port {
+			port@0 {
+				reg = <0>;
 				modem_etm0_out_funnel_in1: endpoint {
 					remote-endpoint =
 					<&funnel_in1_in_modem_etm0>;
 				};
 			};
+
+			port@1 {
+				reg = <1>;
+				modem_etm0_out_qmi: endpoint {
+					remote-endpoint =
+					<&qmi_in_modem_etm0>;
+				};
+			};
+		};
+	};
+
+	modem-qmi {
+		compatible = "qcom,coresight-qmi";
+
+		coresight-name = "coresight-qmi-modem";
+		qcom,inst-id = <2>;
+
+		in-ports {
+			port {
+				qmi_in_modem_etm0: endpoint {
+					remote-endpoint =
+						<&modem_etm0_out_qmi>;
+				};
+			};
 		};
 	};
 
@@ -913,13 +957,13 @@
 		};
 	};
 
-	tpda: tpda@8004000 {
+	tpda_dl: tpda@8004000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb969>;
 		reg = <0x8004000 0x1000>;
 		reg-names = "tpda-base";
 
-		coresight-name = "coresight-tpda";
+		coresight-name = "coresight-tpda-dl";
 
 		qcom,tpda-atid = <65>;
 		qcom,dsb-elem-size = <0 32>,