Switch to updated coresight bindings for hw ports.

Cc: Sudeep Holla <sudeep.ho...@arm.com>
Cc: Liviu Dudau <liviu.du...@arm.com>
Cc: Mathieu Poirier <mathieu.poir...@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi | 82 +++++++++++++++++++++++++---------
 arch/arm64/boot/dts/arm/juno.dts       |  5 ++-
 2 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi 
b/arch/arm64/boot/dts/arm/juno-base.dtsi
index eb749c5..33b41ba 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -122,15 +122,18 @@
                        port@0 {
                                reg = <0>;
                                etf0_in_port: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&main_funnel_out_port>;
+                                       coresight,hwid = <0>;
                                };
                        };
 
                        /* output port */
                        port@1 {
-                               reg = <0>;
+                               reg = <1>;
                                etf0_out_port: endpoint {
+                                       coresight,hwid = <0>;
+                                       direction = <1>;
                                };
                        };
                };
@@ -145,8 +148,9 @@
                power-domains = <&scpi_devpd 0>;
                port {
                        tpiu_in_port: endpoint {
-                               slave-mode;
+                               direction = <0>;
                                remote-endpoint = <&replicator_out_port0>;
+                               coresight,hwid = <0>;
                        };
                };
        };
@@ -168,23 +172,27 @@
                                reg = <0>;
                                main_funnel_out_port: endpoint {
                                        remote-endpoint = <&etf0_in_port>;
+                                       coresight,hwid = <0>;
+                                       direction = <1>;
                                };
                        };
 
                        /* input ports */
                        port@1 {
-                               reg = <0>;
+                               reg = <1>;
                                main_funnel_in_port0: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster0_funnel_out_port>;
+                                       coresight,hwid = <0>;
                                };
                        };
 
                        port@2 {
-                               reg = <1>;
+                               reg = <2>;
                                main_funnel_in_port1: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster1_funnel_out_port>;
+                                       coresight,hwid = <1>;
                                };
                        };
                };
@@ -200,8 +208,9 @@
                power-domains = <&scpi_devpd 0>;
                port {
                        etr_in_port: endpoint {
-                               slave-mode;
+                               direction = <0>;
                                remote-endpoint = <&replicator_out_port1>;
+                               coresight,hwid = <0>;
                        };
                };
        };
@@ -217,6 +226,8 @@
                power-domains = <&scpi_devpd 0>;
                port {
                        stm_out_port: endpoint {
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -240,6 +251,8 @@
                port {
                        cluster0_etm0_out_port: endpoint {
                                remote-endpoint = <&cluster0_funnel_in_port0>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -259,22 +272,26 @@
                                reg = <0>;
                                cluster0_funnel_out_port: endpoint {
                                        remote-endpoint = 
<&main_funnel_in_port0>;
+                                       coresight,hwid = <0>;
+                                       direction = <1>;
                                };
                        };
 
                        port@1 {
-                               reg = <0>;
+                               reg = <1>;
                                cluster0_funnel_in_port0: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster0_etm0_out_port>;
+                                       coresight,hwid = <0>;
                                };
                        };
 
                        port@2 {
-                               reg = <1>;
+                               reg = <2>;
                                cluster0_funnel_in_port1: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster0_etm1_out_port>;
+                                       coresight,hwid = <1>;
                                };
                        };
                };
@@ -299,6 +316,8 @@
                port {
                        cluster0_etm1_out_port: endpoint {
                                remote-endpoint = <&cluster0_funnel_in_port1>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -322,6 +341,8 @@
                port {
                        cluster1_etm0_out_port: endpoint {
                                remote-endpoint = <&cluster1_funnel_in_port0>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -341,36 +362,42 @@
                                reg = <0>;
                                cluster1_funnel_out_port: endpoint {
                                        remote-endpoint = 
<&main_funnel_in_port1>;
+                                       coresight,hwid = <0>;
+                                       direction = <1>;
                                };
                        };
 
                        port@1 {
-                               reg = <0>;
+                               reg = <1>;
                                cluster1_funnel_in_port0: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster1_etm0_out_port>;
+                                       coresight,hwid = <0>;
                                };
                        };
 
                        port@2 {
-                               reg = <1>;
+                               reg = <2>;
                                cluster1_funnel_in_port1: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster1_etm1_out_port>;
+                                       coresight,hwid = <1>;
                                };
                        };
                        port@3 {
-                               reg = <2>;
+                               reg = <3>;
                                cluster1_funnel_in_port2: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster1_etm2_out_port>;
+                                       coresight,hwid = <2>;
                                };
                        };
                        port@4 {
-                               reg = <3>;
+                               reg = <4>;
                                cluster1_funnel_in_port3: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
                                        remote-endpoint = 
<&cluster1_etm3_out_port>;
+                                       coresight,hwid = <3>;
                                };
                        };
                };
@@ -395,6 +422,8 @@
                port {
                        cluster1_etm1_out_port: endpoint {
                                remote-endpoint = <&cluster1_funnel_in_port1>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -418,6 +447,8 @@
                port {
                        cluster1_etm2_out_port: endpoint {
                                remote-endpoint = <&cluster1_funnel_in_port2>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -441,6 +472,8 @@
                port {
                        cluster1_etm3_out_port: endpoint {
                                remote-endpoint = <&cluster1_funnel_in_port3>;
+                               coresight,hwid = <0>;
+                               direction = <1>;
                        };
                };
        };
@@ -462,6 +495,8 @@
                                reg = <0>;
                                replicator_out_port0: endpoint {
                                        remote-endpoint = <&tpiu_in_port>;
+                                       coresight,hwid = <0>;
+                                       direction = <1>;
                                };
                        };
 
@@ -469,14 +504,17 @@
                                reg = <1>;
                                replicator_out_port1: endpoint {
                                        remote-endpoint = <&etr_in_port>;
+                                       coresight,hwid = <1>;
+                                       direction = <1>;
                                };
                        };
 
                        /* replicator input port */
                        port@2 {
-                               reg = <0>;
+                               reg = <2>;
                                replicator_in_port0: endpoint {
-                                       slave-mode;
+                                       direction = <0>;
+                                       coresight,hwid = <0>;
                                };
                        };
                };
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index c9236c4..27b8036 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -260,10 +260,11 @@
 &main_funnel {
        ports {
                port@3 {
-                       reg = <2>;
+                       reg = <3>;
                        main_funnel_in_port2: endpoint {
-                               slave-mode;
+                               direction = <0>;
                                remote-endpoint = <&stm_out_port>;
+                               coresight,hwid = <2>;
                        };
                };
        };
-- 
2.7.4

Reply via email to