ARM: dts: qcom: Update coresight bindings for hardware ports

Switch to the new hardware port bindings for coresight

Cc: Andy Gross <andy.gross@linaro.org>
Cc: David Brown <david.brown@linaro.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

arch/arm/boot/dts/qcom-apq8064.dtsi

@@ -1611,13 +1611,14 @@ etb@1a01000 {
 			clocks = <&rpmcc RPM_QDSS_CLK>;
 			clock-names = "apb_pclk";
 
+			in-ports {
 				port {
 					etb_in: endpoint {
-					slave-mode;
 						remote-endpoint = <&replicator_out0>;
 					};
 				};
 			};
+		};
 
 		tpiu@1a03000 {
 			compatible = "arm,coresight-tpiu", "arm,primecell";
@@ -1626,13 +1627,14 @@ tpiu@1a03000 {
 			clocks = <&rpmcc RPM_QDSS_CLK>;
 			clock-names = "apb_pclk";
 
+			in-ports {
 				port {
 					tpiu_in: endpoint {
-					slave-mode;
 						remote-endpoint = <&replicator_out1>;
 					};
 				};
 			};
+		};
 
 		replicator {
 			compatible = "arm,coresight-replicator";
@@ -1640,7 +1642,7 @@ replicator {
 			clocks = <&rpmcc RPM_QDSS_CLK>;
 			clock-names = "apb_pclk";
 
-			ports {
+			out-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -1656,10 +1658,11 @@ replicator_out1: endpoint {
 						remote-endpoint = <&tpiu_in>;
 					};
 				};
-				port@2 {
-					reg = <0>;
+			};
+
+			in-ports {
+				port {
 					replicator_in: endpoint {
-						slave-mode;
 						remote-endpoint = <&funnel_out>;
 					};
 				};
@@ -1673,7 +1676,7 @@ funnel@1a04000 {
 			clocks = <&rpmcc RPM_QDSS_CLK>;
 			clock-names = "apb_pclk";
 
-			ports {
+			in-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -1687,33 +1690,31 @@ ports {
 				port@0 {
 					reg = <0>;
 					funnel_in0: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm0_out>;
 					};
 				};
 				port@1 {
 					reg = <1>;
 					funnel_in1: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm1_out>;
 					};
 				};
 				port@4 {
 					reg = <4>;
 					funnel_in4: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm2_out>;
 					};
 				};
 				port@5 {
 					reg = <5>;
 					funnel_in5: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm3_out>;
 					};
 				};
-				port@8 {
-					reg = <0>;
+			};
+
+			out-ports {
+				port {
 					funnel_out: endpoint {
 						remote-endpoint = <&replicator_in>;
 					};
@@ -1730,12 +1731,14 @@ etm@1a1c000 {
 
 			cpu = <&CPU0>;
 
+			out-ports {
 				port {
 					etm0_out: endpoint {
 						remote-endpoint = <&funnel_in0>;
 					};
 				};
 			};
+		};
 
 		etm@1a1d000 {
 			compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -1746,12 +1749,14 @@ etm@1a1d000 {
 
 			cpu = <&CPU1>;
 
+			out-ports {
 				port {
 					etm1_out: endpoint {
 						remote-endpoint = <&funnel_in1>;
 					};
 				};
 			};
+		};
 
 		etm@1a1e000 {
 			compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -1762,12 +1767,14 @@ etm@1a1e000 {
 
 			cpu = <&CPU2>;
 
+			out-ports {
 				port {
 					etm2_out: endpoint {
 						remote-endpoint = <&funnel_in4>;
 					};
 				};
 			};
+		};
 
 		etm@1a1f000 {
 			compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -1778,6 +1785,7 @@ etm@1a1f000 {
 
 			cpu = <&CPU3>;
 
+			out-ports {
 				port {
 					etm3_out: endpoint {
 						remote-endpoint = <&funnel_in5>;
@@ -1785,5 +1793,6 @@ etm3_out: endpoint {
 				};
 			};
 		};
+	};
 };
 #include "qcom-apq8064-pins.dtsi"

arch/arm/boot/dts/qcom-msm8974.dtsi

@@ -794,13 +794,14 @@ etr@fc322000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
+			in-ports {
 				port {
 					etr_in: endpoint {
-					slave-mode;
 						remote-endpoint = <&replicator_out0>;
 					};
 				};
 			};
+		};
 
 		tpiu@fc318000 {
 			compatible = "arm,coresight-tpiu", "arm,primecell";
@@ -809,13 +810,14 @@ tpiu@fc318000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
+			in-ports {
 				port {
 					tpiu_in: endpoint {
-					 slave-mode;
 						remote-endpoint = <&replicator_out1>;
 					};
 				 };
 			};
+		};
 
 		replicator@fc31c000 {
 			compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
@@ -824,7 +826,7 @@ replicator@fc31c000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
-			ports {
+			out-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -840,10 +842,11 @@ replicator_out1: endpoint {
 						remote-endpoint = <&tpiu_in>;
 					};
 				};
-				port@2 {
-					reg = <0>;
+			};
+
+			in-ports {
+				port {
 					replicator_in: endpoint {
-						slave-mode;
 						remote-endpoint = <&etf_out>;
 					};
 				};
@@ -857,20 +860,17 @@ etf@fc307000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port@0 {
-					reg = <0>;
+			out-ports {
+				port {
 					etf_out: endpoint {
 						remote-endpoint = <&replicator_in>;
 					};
 				};
-				port@1 {
-					reg = <0>;
+			};
+
+			in-ports {
+				port {
 					etf_in: endpoint {
-						slave-mode;
 						remote-endpoint = <&merger_out>;
 					};
 				};
@@ -884,7 +884,7 @@ funnel@fc31b000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
-			ports {
+			in-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -897,12 +897,13 @@ ports {
 				port@1 {
 					reg = <1>;
 					merger_in1: endpoint {
-						slave-mode;
 						remote-endpoint = <&funnel1_out>;
 					};
 				};
-				port@8 {
-					reg = <0>;
+			};
+
+			out-ports {
+				port {
 					merger_out: endpoint {
 						remote-endpoint = <&etf_in>;
 					};
@@ -917,7 +918,7 @@ funnel@fc31a000 {
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
-			ports {
+			in-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
@@ -934,12 +935,13 @@ ports {
 				port@5 {
 					reg = <5>;
 					funnel1_in5: endpoint {
-						slave-mode;
 						remote-endpoint = <&kpss_out>;
 					};
 				};
-				port@8 {
-					reg = <0>;
+			};
+
+			out-ports {
+				port {
 					funnel1_out: endpoint {
 						remote-endpoint = <&merger_in1>;
 					};
@@ -954,40 +956,38 @@ funnel@fc345000 { /* KPSS funnel only 4 inputs are used */
 			clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
 			clock-names = "apb_pclk", "atclk";
 
-			ports {
+			in-ports {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
 				port@0 {
 					reg = <0>;
 					kpss_in0: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm0_out>;
 					};
 				};
 				port@1 {
 					reg = <1>;
 					kpss_in1: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm1_out>;
 					};
 				};
 				port@2 {
 					reg = <2>;
 					kpss_in2: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm2_out>;
 					};
 				};
 				port@3 {
 					reg = <3>;
 					kpss_in3: endpoint {
-						slave-mode;
 						remote-endpoint = <&etm3_out>;
 					};
 				};
-				port@8 {
-					reg = <0>;
+			};
+
+			out-ports {
+				port {
 					kpss_out: endpoint {
 						remote-endpoint = <&funnel1_in5>;
 					};
@@ -1004,12 +1004,14 @@ etm@fc33c000 {
 
 			cpu = <&CPU0>;
 
+			out-ports {
 				port {
 					etm0_out: endpoint {
 						remote-endpoint = <&kpss_in0>;
 					};
 				};
 			};
+		};
 
 		etm@fc33d000 {
 			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1020,12 +1022,14 @@ etm@fc33d000 {
 
 			cpu = <&CPU1>;
 
+			out-ports {
 				port {
 					etm1_out: endpoint {
 						remote-endpoint = <&kpss_in1>;
 					};
 				};
 			};
+		};
 
 		etm@fc33e000 {
 			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1036,12 +1040,14 @@ etm@fc33e000 {
 
 			cpu = <&CPU2>;
 
+			out-ports {
 				port {
 					etm2_out: endpoint {
 						remote-endpoint = <&kpss_in2>;
 					};
 				};
 			};
+		};
 
 		etm@fc33f000 {
 			compatible = "arm,coresight-etm4x", "arm,primecell";
@@ -1052,6 +1058,7 @@ etm@fc33f000 {
 
 			cpu = <&CPU3>;
 
+			out-ports {
 				port {
 					etm3_out: endpoint {
 						remote-endpoint = <&kpss_in3>;
@@ -1059,6 +1066,7 @@ etm3_out: endpoint {
 				};
 			};
 		};
+	};
 
 	smd {
 		compatible = "qcom,smd";