arm64: dts: msm8916: Update coresight bindings for hardware ports

Switch to updated coresight bindings for hw ports

Cc: Andy Gross <andy.gross@linaro.org>
Cc: David Brown <david.brown@linaro.org>
Cc: Ivan T. Ivanov <ivan.ivanov@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>

1 files changed, 51 insertions, 44 deletions

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 726a45960742..d302d8d639a1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1096,10 +1096,11 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_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>;
+                                        };
                                 };
                         };
                 };
@@ -1111,7 +1112,7 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
                         clock-names = "apb_pclk", "atclk";
 
-                        ports {
+                        in-ports {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
 
@@ -1129,12 +1130,13 @@
                                 port@4 {
                                         reg = <4>;
                                         funnel0_in4: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&funnel1_out>;
                                         };
                                 };
-                                port@8 {
-                                        reg = <0>;
+                        };
+
+                        out-ports {
+                                port {
                                         funnel0_out: endpoint {
                                                 remote-endpoint = <&etf_in>;
                                         };
@@ -1149,7 +1151,7 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
                         clock-names = "apb_pclk", "atclk";
 
-                        ports {
+                        out-ports {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
 
@@ -1165,10 +1167,11 @@
                                                 remote-endpoint = <&tpiu_in>;
                                         };
                                 };
-                                port@2 {
-                                        reg = <0>;
+                        };
+
+                        in-ports {
+                                port {
                                         replicator_in: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etf_out>;
                                         };
                                 };
@@ -1182,19 +1185,16 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
                         clock-names = "apb_pclk", "atclk";
 
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                port@0 {
-                                        reg = <0>;
+                        in-ports {
+                                port {
                                         etf_in: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&funnel0_out>;
                                         };
                                 };
-                                port@1 {
-                                        reg = <0>;
+                        };
+
+                        out-ports {
+                                port {
                                         etf_out: endpoint {
                                                 remote-endpoint = <&replicator_in>;
                                         };
@@ -1209,10 +1209,11 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_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>;
+                                        };
                                 };
                         };
                 };
@@ -1224,40 +1225,38 @@
                         clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
                         clock-names = "apb_pclk", "atclk";
 
-                        ports {
+                        in-ports {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
 
                                 port@0 {
                                         reg = <0>;
                                         funnel1_in0: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etm0_out>;
                                         };
                                 };
                                 port@1 {
                                         reg = <1>;
                                         funnel1_in1: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etm1_out>;
                                         };
                                 };
                                 port@2 {
                                         reg = <2>;
                                         funnel1_in2: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etm2_out>;
                                         };
                                 };
                                 port@3 {
                                         reg = <3>;
                                         funnel1_in3: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etm3_out>;
                                         };
                                 };
-                                port@4 {
-                                        reg = <0>;
+                        };
+
+                        out-ports {
+                                port {
                                         funnel1_out: endpoint {
                                                 remote-endpoint = <&funnel0_in4>;
                                         };
@@ -1306,9 +1305,11 @@
 
                         cpu = <&CPU0>;
 
-                        port {
-                                etm0_out: endpoint {
-                                remote-endpoint = <&funnel1_in0>;
+                        out-ports {
+                                port {
+                                        etm0_out: endpoint {
+                                                remote-endpoint = <&funnel1_in0>;
+                                        };
                                 };
                         };
                 };
@@ -1322,9 +1323,11 @@
 
                         cpu = <&CPU1>;
 
-                        port {
-                                etm1_out: endpoint {
-                                        remote-endpoint = <&funnel1_in1>;
+                        out-ports {
+                                port {
+                                        etm1_out: endpoint {
+                                                remote-endpoint = <&funnel1_in1>;
+                                        };
                                 };
                         };
                 };
@@ -1338,9 +1341,11 @@
 
                         cpu = <&CPU2>;
 
-                        port {
-                                etm2_out: endpoint {
-                                        remote-endpoint = <&funnel1_in2>;
+                        out-ports {
+                                port {
+                                        etm2_out: endpoint {
+                                                remote-endpoint = <&funnel1_in2>;
+                                        };
                                 };
                         };
                 };
@@ -1354,9 +1359,11 @@
 
                         cpu = <&CPU3>;
 
-                        port {
-                                etm3_out: endpoint {
-                                        remote-endpoint = <&funnel1_in3>;
+                        out-ports {
+                                port {
+                                        etm3_out: endpoint {
+                                                remote-endpoint = <&funnel1_in3>;
+                                        };
                                 };
                         };
                 };