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>

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 4a99c9255104913964cbe9b984d9150bd52d7ef9..48c3cf42761012c274707b2060298d36bea3379f 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1611,10 +1611,11 @@
                        clocks = <&rpmcc RPM_QDSS_CLK>;
                        clock-names = "apb_pclk";
 
-                       port {
-                               etb_in: endpoint {
-                                       slave-mode;
-                                       remote-endpoint = <&replicator_out0>;
+                       in-ports {
+                               port {
+                                       etb_in: endpoint {
+                                               remote-endpoint = <&replicator_out0>;
+                                       };
                                };
                        };
                };
@@ -1626,10 +1627,11 @@
                        clocks = <&rpmcc RPM_QDSS_CLK>;
                        clock-names = "apb_pclk";
 
-                       port {
-                               tpiu_in: endpoint {
-                                       slave-mode;
-                                       remote-endpoint = <&replicator_out1>;
+                       in-ports {
+                               port {
+                                       tpiu_in: endpoint {
+                                               remote-endpoint = <&replicator_out1>;
+                                       };
                                };
                        };
                };
@@ -1640,7 +1642,7 @@
                        clocks = <&rpmcc RPM_QDSS_CLK>;
                        clock-names = "apb_pclk";
 
-                       ports {
+                       out-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -1656,10 +1658,11 @@
                                                remote-endpoint = <&tpiu_in>;
                                        };
                                };
-                               port@2 {
-                                       reg = <0>;
+                       };
+
+                       in-ports {
+                               port {
                                        replicator_in: endpoint {
-                                               slave-mode;
                                                remote-endpoint = <&funnel_out>;
                                        };
                                };
@@ -1673,7 +1676,7 @@
                        clocks = <&rpmcc RPM_QDSS_CLK>;
                        clock-names = "apb_pclk";
 
-                       ports {
+                       in-ports {
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -1687,33 +1690,31 @@
                                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,9 +1731,11 @@
 
                        cpu = <&CPU0>;
 
-                       port {
-                               etm0_out: endpoint {
-                                       remote-endpoint = <&funnel_in0>;
+                       out-ports {
+                               port {
+                                       etm0_out: endpoint {
+                                               remote-endpoint = <&funnel_in0>;
+                                       };
                                };
                        };
                };
@@ -1746,9 +1749,11 @@
 
                        cpu = <&CPU1>;
 
-                       port {
-                               etm1_out: endpoint {
-                                       remote-endpoint = <&funnel_in1>;
+                       out-ports {
+                               port {
+                                       etm1_out: endpoint {
+                                               remote-endpoint = <&funnel_in1>;
+                                       };
                                };
                        };
                };
@@ -1762,9 +1767,11 @@
 
                        cpu = <&CPU2>;
 
-                       port {
-                               etm2_out: endpoint {
-                                       remote-endpoint = <&funnel_in4>;
+                       out-ports {
+                               port {
+                                       etm2_out: endpoint {
+                                               remote-endpoint = <&funnel_in4>;
+                                       };
                                };
                        };
                };
@@ -1778,9 +1785,11 @@
 
                        cpu = <&CPU3>;
 
-                       port {
-                               etm3_out: endpoint {
-                                       remote-endpoint = <&funnel_in5>;
+                       out-ports {
+                               port {
+                                       etm3_out: endpoint {
+                                               remote-endpoint = <&funnel_in5>;
+                                       };
                                };
                        };
                };

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index a808973f9dc73c79fdf781faae5e47d625c3252b..aba159d5a95aa3b6f7f1d11f895741d01033df17 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -794,10 +794,11 @@
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
 
-                       port {
-                               etr_in: endpoint {
-                                       slave-mode;
-                                       remote-endpoint = <&replicator_out0>;
+                       in-ports {
+                               port {
+                                       etr_in: endpoint {
+                                               remote-endpoint = <&replicator_out0>;
+                                       };
                                };
                        };
                };
@@ -809,10 +810,11 @@
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
                        clock-names = "apb_pclk", "atclk";
 
-                       port {
-                               tpiu_in: endpoint {
-                                        slave-mode;
-                                        remote-endpoint = <&replicator_out1>;
+                       in-ports {
+                               port {
+                                       tpiu_in: endpoint {
+                                               remote-endpoint = <&replicator_out1>;
+                                       };
                                 };
                        };
                };
@@ -824,7 +826,7 @@
                        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 @@
                                                remote-endpoint = <&tpiu_in>;
                                        };
                                };
-                               port@2 {
-                                       reg = <0>;
+                       };
+
+                       in-ports {
+                               port {
                                        replicator_in: endpoint {
-                                               slave-mode;
                                                remote-endpoint = <&etf_out>;
                                        };
                                };
@@ -857,20 +860,17 @@
                        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 @@
                        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 @@
                                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 @@
                        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 @@
                                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 @@
                        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,9 +1004,11 @@
 
                        cpu = <&CPU0>;
 
-                       port {
-                               etm0_out: endpoint {
-                                       remote-endpoint = <&kpss_in0>;
+                       out-ports {
+                               port {
+                                       etm0_out: endpoint {
+                                               remote-endpoint = <&kpss_in0>;
+                                       };
                                };
                        };
                };
@@ -1020,9 +1022,11 @@
 
                        cpu = <&CPU1>;
 
-                       port {
-                               etm1_out: endpoint {
-                                       remote-endpoint = <&kpss_in1>;
+                       out-ports {
+                               port {
+                                       etm1_out: endpoint {
+                                               remote-endpoint = <&kpss_in1>;
+                                       };
                                };
                        };
                };
@@ -1036,9 +1040,11 @@
 
                        cpu = <&CPU2>;
 
-                       port {
-                               etm2_out: endpoint {
-                                       remote-endpoint = <&kpss_in2>;
+                       out-ports {
+                               port {
+                                       etm2_out: endpoint {
+                                               remote-endpoint = <&kpss_in2>;
+                                       };
                                };
                        };
                };
@@ -1052,9 +1058,11 @@
 
                        cpu = <&CPU3>;
 
-                       port {
-                               etm3_out: endpoint {
-                                       remote-endpoint = <&kpss_in3>;
+                       out-ports {
+                               port {
+                                       etm3_out: endpoint {
+                                               remote-endpoint = <&kpss_in3>;
+                                       };
                                };
                        };
                };