On Mon, 18 Jun 2018 at 20:13, Shawn Guo [off-list ref] wrote:

Hi Stefan,

Can you take a look at the patch?  Thanks.

These bindings are still being discussed and patches related to them
shouldn't be merged.  The next iteration of this patchset will not
included individual modifications to device tree files, that will be
left for a later time when bindings have been agreed upon.

Thanks,
Mathieu

Shawn

On Tue, Jun 05, 2018 at 10:43:26PM +0100, Suzuki K Poulose wrote:

quoted

Switch to the updated coresight bindings.

Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
 arch/arm/boot/dts/imx7d.dtsi |  5 ++++-
 arch/arm/boot/dts/imx7s.dtsi | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 200714e..5faff17 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi

@@ -87,7 +87,9 @@

                      port {
                              etm1_out_port: endpoint {
+                                     direction = <1>;
                                      remote-endpoint = <&ca_funnel_in_port1>;
+                                     coresight,hwid = <0>;
                              };
                      };
              };

@@ -174,8 +176,9 @@
      port@1 {
              reg = <1>;
              ca_funnel_in_port1: endpoint {
-                     slave-mode;
+                     direction = <0>;
                      remote-endpoint = <&etm1_out_port>;
+                     coresight,hwid = <1>;
              };
      };
 };

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 4d42335..8e90915 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi

@@ -151,23 +151,28 @@
                      port@0 {
                              reg = <0>;
                              replicator_out_port0: endpoint {
+                                     direction = <1>;
                                      remote-endpoint = <&tpiu_in_port>;
+                                     coresight,hwid = <0>;
                              };
                      };

                      port@1 {
                              reg = <1>;
                              replicator_out_port1: endpoint {
+                                     direction = <1>;
                                      remote-endpoint = <&etr_in_port>;
+                                     coresight,hwid = <1>;
                              };
                      };

                      /* replicator input port */
                      port@2 {
-                             reg = <0>;
+                             reg = <2>;
                              replicator_in_port0: endpoint {
-                                     slave-mode;
+                                     direction = <0>;
                                      remote-endpoint = <&etf_out_port>;
+                                     coresight,hwid = <0>;
                              };
                      };
              };

@@ -203,16 +208,19 @@
                              port@0 {
                                      reg = <0>;
                                      ca_funnel_in_port0: endpoint {
-                                             slave-mode;
+                                             direction = <0>;
                                              remote-endpoint = <&etm0_out_port>;
+                                             coresight,hwid = <0>;
                                      };
                              };

                              /* funnel output port */
                              port@2 {
-                                     reg = <0>;
+                                     reg = <2>;
                                      ca_funnel_out_port0: endpoint {
+                                             direction = <1>;
                                              remote-endpoint = <&hugo_funnel_in_port0>;
+                                             coresight,hwid = <0>;
                                      };
                              };

@@ -229,7 +237,9 @@

                      port {
                              etm0_out_port: endpoint {
+                                     direction = <1>;
                                      remote-endpoint = <&ca_funnel_in_port0>;
+                                     coresight,hwid = <0>;
                              };
                      };
              };

@@ -248,22 +258,26 @@
                              port@0 {
                                      reg = <0>;
                                      hugo_funnel_in_port0: endpoint {
-                                             slave-mode;
+                                             direction = <0>;
                                              remote-endpoint = <&ca_funnel_out_port0>;
+                                             coresight,hwid = <0>;
                                      };
                              };

                              port@1 {
                                      reg = <1>;
                                      hugo_funnel_in_port1: endpoint {
-                                             slave-mode; /* M4 input */
+                                             direction = <0>; /* M4 input */
+                                             coresight,hwid = <1>;
                                      };
                              };

                              port@2 {
-                                     reg = <0>;
+                                     reg = <2>;
                                      hugo_funnel_out_port0: endpoint {
+                                             direction = <1>;
                                              remote-endpoint = <&etf_in_port>;
+                                             coresight,hwid = <0>;
                                      };
                              };

@@ -284,15 +298,18 @@
                              port@0 {
                                      reg = <0>;
                                      etf_in_port: endpoint {
-                                             slave-mode;
+                                             direction = <0>;
                                              remote-endpoint = <&hugo_funnel_out_port0>;
+                                             coresight,hwid = <0>;
                                      };
                              };

                              port@1 {
-                                     reg = <0>;
+                                     reg = <1>;
                                      etf_out_port: endpoint {
+                                             direction = <1>;
                                              remote-endpoint = <&replicator_in_port0>;
+                                             coresight,hwid = <0>;
                                      };
                              };
                      };

@@ -306,8 +323,9 @@

                      port {
                              etr_in_port: endpoint {
-                                     slave-mode;
+                                     direction = <0>;
                                      remote-endpoint = <&replicator_out_port1>;
+                                     coresight,hwid = <0>;
                              };
                      };
              };

@@ -320,8 +338,9 @@

                      port {
                              tpiu_in_port: endpoint {
-                                     slave-mode;
+                                     direction = <0>;
                                      remote-endpoint = <&replicator_out_port1>;
+                                     coresight,hwid = <0>;
                              };
                      };
              };
--

2.7.4