ARM: dts: imx7: Update coresight binding for hardware ports

Switch to the updated coresight bindings.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

2 files changed, 46 insertions, 50 deletions

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index fa675b8d84e9..73c35939e07c 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -64,9 +64,11 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        port {
-                                etm1_out_port: endpoint {
-                                        remote-endpoint = <&ca_funnel_in_port1>;
+                        out-ports {
+                                port {
+                                        etm1_out_port: endpoint {
+                                                remote-endpoint = <&ca_funnel_in_port1>;
+                                        };
                                 };
                         };
                 };
@@ -153,11 +155,13 @@
         };
 };
 
-&ca_funnel_ports {
+&ca_funnel_in_ports {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
         port@1 {
                 reg = <1>;
                 ca_funnel_in_port1: endpoint {
-                        slave-mode;
                         remote-endpoint = <&etm1_out_port>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index d3f64882f861..c59ca470f963 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -120,7 +120,7 @@
                  */
                 compatible = "arm,coresight-replicator";
 
-                ports {
+                out-ports {
                         #address-cells = <1>;
                         #size-cells = <0>;
                                 /* replicator output ports */
@@ -137,12 +137,11 @@
                                         remote-endpoint = <&etr_in_port>;
                                 };
                         };
+                };
 
-                        /* replicator input port */
-                        port@2 {
-                                reg = <0>;
+                in-ports {
+                        port {
                                 replicator_in_port0: endpoint {
-                                        slave-mode;
                                         remote-endpoint = <&etf_out_port>;
                                 };
                         };
@@ -182,28 +181,23 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        ca_funnel_ports: ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                /* funnel input ports */
-                                port@0 {
-                                        reg = <0>;
+                        ca_funnel_in_ports: in-ports {
+                                port {
                                         ca_funnel_in_port0: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&etm0_out_port>;
                                         };
                                 };
 
-                                /* funnel output port */
-                                port@2 {
-                                        reg = <0>;
+                                /* the other input ports are not connect to anything */
+                        };
+
+                        out-ports {
+                                port {
                                         ca_funnel_out_port0: endpoint {
                                                 remote-endpoint = <&hugo_funnel_in_port0>;
                                         };
                                 };
 
-                                /* the other input ports are not connect to anything */
                         };
                 };
 
@@ -214,9 +208,11 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        port {
-                                etm0_out_port: endpoint {
-                                        remote-endpoint = <&ca_funnel_in_port0>;
+                        out-ports {
+                                port {
+                                        etm0_out_port: endpoint {
+                                                remote-endpoint = <&ca_funnel_in_port0>;
+                                        };
                                 };
                         };
                 };
@@ -227,15 +223,13 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        ports {
+                        in-ports {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
 
-                                /* funnel input ports */
                                 port@0 {
                                         reg = <0>;
                                         hugo_funnel_in_port0: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&ca_funnel_out_port0>;
                                         };
                                 };
@@ -243,18 +237,18 @@
                                 port@1 {
                                         reg = <1>;
                                         hugo_funnel_in_port1: endpoint {
-                                                slave-mode; /* M4 input */
+                                                /* M4 input */
                                         };
                                 };
+                                /* the other input ports are not connect to anything */
+                        };
 
-                                port@2 {
-                                        reg = <0>;
+                        out-ports {
+                                port {
                                         hugo_funnel_out_port0: endpoint {
                                                 remote-endpoint = <&etf_in_port>;
                                         };
                                 };
-
-                                /* the other input ports are not connect to anything */
                         };
                 };
 
@@ -264,20 +258,16 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                port@0 {
-                                        reg = <0>;
+                        in-ports {
+                                port {
                                         etf_in_port: endpoint {
-                                                slave-mode;
                                                 remote-endpoint = <&hugo_funnel_out_port0>;
                                         };
                                 };
+                        };
 
-                                port@1 {
-                                        reg = <0>;
+                        out-ports {
+                                port {
                                         etf_out_port: endpoint {
                                                 remote-endpoint = <&replicator_in_port0>;
                                         };
@@ -291,10 +281,11 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        port {
-                                etr_in_port: endpoint {
-                                        slave-mode;
-                                        remote-endpoint = <&replicator_out_port1>;
+                        in-ports {
+                                port {
+                                        etr_in_port: endpoint {
+                                                remote-endpoint = <&replicator_out_port1>;
+                                        };
                                 };
                         };
                 };
@@ -305,10 +296,11 @@
                         clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>;
                         clock-names = "apb_pclk";
 
-                        port {
-                                tpiu_in_port: endpoint {
-                                        slave-mode;
-                                        remote-endpoint = <&replicator_out_port0>;
+                        in-ports {
+                                port {
+                                        tpiu_in_port: endpoint {
+                                                remote-endpoint = <&replicator_out_port0>;
+                                        };
                                 };
                         };
                 };