From 31039d0a65f3a181f22e5896592d0b492746c2fd Mon Sep 17 00:00:00 2001
From: Yuanfang Zhang <quic_yuanfang@quicinc.com>
Date: Mon, 15 Apr 2024 20:04:07 -0700
Subject: [PATCH] Revert "ARM: dts: msm: add dynamic ATID support for diag/stm
 on sun"

This reverts commit 327251750e8a508c28b2e67e530881bdfd1f34f6.

Change-Id: I826013462127bc3bb393bd3cf9e34bf1b24dc73b
Signed-off-by: Yuanfang Zhang <quic_yuanfang@quicinc.com>
---
 qcom/sun-coresight.dtsi | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/qcom/sun-coresight.dtsi b/qcom/sun-coresight.dtsi
index 4aca458d..a1aafd4b 100644
--- a/qcom/sun-coresight.dtsi
+++ b/qcom/sun-coresight.dtsi
@@ -1023,24 +1023,15 @@
 		compatible = "arm,coresight-dummy-source";
 
 		coresight-name = "coresight-modem-diag";
-		qcom,atid-num = <1>;
-		trace-name = "modem-diag";
+		atid = <50>;
+
 		out-ports {
-			port@0 {
-				reg = <0>;
+			port {
 				modem_diag_out_funnel_modem_q6: endpoint {
 					remote-endpoint =
 					<&funnel_modem_q6_in_modem_diag>;
 				};
 			};
-
-			port@1 {
-				reg = <1>;
-				modem_diag_out_qmi: endpoint {
-					remote-endpoint =
-						<&qmi_in_modem_diag>;
-				};
-			};
 		};
 	};
 
@@ -4105,6 +4096,7 @@
 		reg-names = "stm-base", "stm-stimulus-base";
 
 		coresight-name = "coresight-stm";
+		atid = <16>;
 
 		clocks = <&aoss_qmp>;
 		clock-names = "apb_pclk";
@@ -5491,14 +5483,6 @@
 						<&tmc_modem_out_qmi>;
 				};
 			};
-
-			port@3 {
-				reg = <3>;
-				qmi_in_modem_diag: endpoint {
-					remote-endpoint =
-						<&modem_diag_out_qmi>;
-				};
-			};
 		};
 	};