From 149fd91ae5a88adfceeb3def91ee83a2fb7f0df4 Mon Sep 17 00:00:00 2001
From: "Tao,Zhang" <taozha@qti.qualcomm.com>
Date: Fri, 15 Jan 2021 11:37:11 +0800
Subject: [PATCH] ARM: dts: msm: Change some coresight component names

Change some coresight component names, and make them corresponding
to the names on IPCAT.

Change-Id: I4e9b18206db6483ded14ca051a1f5cd43ab61474
---
 qcom/yupik-coresight.dtsi | 55 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/qcom/yupik-coresight.dtsi b/qcom/yupik-coresight.dtsi
index 5a75371c6b43..388e63aaa453 100644
--- a/qcom/yupik-coresight.dtsi
+++ b/qcom/yupik-coresight.dtsi
@@ -784,9 +784,9 @@
 
 			port@5 {
 				reg = <5>;
-				tpda_dlct5_in_tpdm_dlct_1: endpoint {
+				tpda_dlct5_in_tpdm_dl_south: endpoint {
 					remote-endpoint =
-						<&tpdm_dlct_1_out_tpda_dlct5>;
+						<&tpdm_dl_south_out_tpda_dlct5>;
 				};
 			};
 
@@ -856,17 +856,17 @@
 
 			port@18 {
 				reg = <27>;
-				tpda_dlct5_in_tpdm_dlct5_0: endpoint {
+				tpda_dlct5_in_tpdm_dlct: endpoint {
 					remote-endpoint =
-						<&tpdm_dlct5_0_out_tpda_dlct5>;
+						<&tpdm_dlct_out_tpda_dlct5>;
 				};
 			};
 
 			port@19 {
 				reg = <28>;
-				tpda_dlct5_in_tpdm_dlct5_1: endpoint {
+				tpda_dlct5_in_tpdm_ipcc: endpoint {
 					remote-endpoint =
-						<&tpdm_dlct5_1_out_tpda_dlct5>;
+						<&tpdm_ipcc_out_tpda_dlct5>;
 				};
 			};
 		};
@@ -930,13 +930,13 @@
 		};
 	};
 
-	tpdm_dlct_1: tpdm@6c08000 {
+	tpdm_dl_south: tpdm@6c08000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb968>;
 		reg = <0x6c08000 0x1000>;
 		reg-names = "tpdm-base";
 
-		coresight-name = "coresight-tpdm-dlct_1";
+		coresight-name = "coresight-tpdm-dl-south";
 
 		clocks = <&aopcc QDSS_CLK>;
 		clock-names = "apb_pclk";
@@ -945,9 +945,9 @@
 
 		out-ports {
 			port {
-				tpdm_dlct_1_out_tpda_dlct5: endpoint {
+				tpdm_dl_south_out_tpda_dlct5: endpoint {
 					remote-endpoint =
-						<&tpda_dlct5_in_tpdm_dlct_1>;
+						<&tpda_dlct5_in_tpdm_dl_south>;
 				};
 			};
 		};
@@ -1408,13 +1408,13 @@
 		};
 	};
 
-	tpdm_dlct5_0: tpdm@6c30000 {
+	tpdm_dlct: tpdm@6c30000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb968>;
 		reg = <0x06c30000 0x1000>;
 		reg-names = "tpdm-base";
 
-		coresight-name = "coresight-tpdm-dlct5_0";
+		coresight-name = "coresight-tpdm-dlct";
 
 		status = "disabled";
 		clocks = <&aopcc QDSS_CLK>;
@@ -1424,23 +1424,22 @@
 
 		out-ports {
 			port {
-				tpdm_dlct5_0_out_tpda_dlct5: endpoint {
+				tpdm_dlct_out_tpda_dlct5: endpoint {
 					remote-endpoint =
-						<&tpda_dlct5_in_tpdm_dlct5_0>;
+						<&tpda_dlct5_in_tpdm_dlct>;
 				};
 			};
 		};
 	};
 
-	tpdm_dlct5_1: tpdm@6c31000 {
+	tpdm_ipcc: tpdm@6c31000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb968>;
 		reg = <0x06c31000 0x1000>;
 		reg-names = "tpdm-base";
 
-		coresight-name = "coresight-tpdm-dlct5_1";
+		coresight-name = "coresight-tpdm-ipcc";
 
-		status = "disabled";
 		clocks = <&aopcc QDSS_CLK>;
 		clock-names = "apb_pclk";
 
@@ -1448,9 +1447,9 @@
 
 		out-ports {
 			port {
-				tpdm_dlct5_1_out_tpda_dlct5: endpoint {
+				tpdm_ipcc_out_tpda_dlct5: endpoint {
 					remote-endpoint =
-						<&tpda_dlct5_in_tpdm_dlct5_1>;
+						<&tpda_dlct5_in_tpdm_ipcc>;
 				};
 			};
 		};
@@ -2202,23 +2201,23 @@
 		};
 	};
 
-	tpdm_wpss_0: tpdm@6c70000 {
+	tpdm_wpss: tpdm@6c70000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb968>;
 
 		reg = <0x6c70000 0x1000>;
 		reg-names = "tpdm-base";
 
-		coresight-name = "coresight-tpdm-wpss-0";
+		coresight-name = "coresight-tpdm-wpss";
 
 		clocks = <&aopcc QDSS_CLK>;
 		clock-names = "apb_pclk";
 
 		out-ports {
 			port {
-				tpdm_wpss_0_out_funnel_wpss: endpoint {
+				tpdm_wpss_out_funnel_wpss: endpoint {
 					remote-endpoint =
-						<&funnel_wpss_in_tpdm_wpss_0>;
+						<&funnel_wpss_in_tpdm_wpss>;
 				};
 			};
 		};
@@ -2257,9 +2256,9 @@
 			#size-cells = <0>;
 			port@0 {
 				reg = <0>;
-				funnel_wpss_in_tpdm_wpss_0: endpoint {
+				funnel_wpss_in_tpdm_wpss: endpoint {
 					remote-endpoint =
-					<&tpdm_wpss_0_out_funnel_wpss>;
+					<&tpdm_wpss_out_funnel_wpss>;
 				};
 			};
 
@@ -2281,7 +2280,7 @@
 				funnel_wpss_out_tpda: endpoint {
 					remote-endpoint =
 						<&tpda_in_funnel_wpss>;
-					source = <&tpdm_wpss_0>;
+					source = <&tpdm_wpss>;
 				};
 			};
 
@@ -2409,13 +2408,13 @@
 		};
 	};
 
-	tpdm_dlet: tpdm@6c28000 {
+	tpdm_dl_east: tpdm@6c28000 {
 		compatible = "arm,primecell";
 		arm,primecell-periphid = <0x000bb968>;
 		reg = <0x6c28000 0x1000>;
 		reg-names = "tpdm-base";
 
-		coresight-name = "coresight-tpdm-dlet";
+		coresight-name = "coresight-tpdm-dl-east";
 
 		clocks = <&aopcc QDSS_CLK>;
 		clock-names = "apb_pclk";