| Message ID | 1536661032-30481-7-git-send-email-suzuki.poulose@arm.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | dts: Update coresight device tree bindings | expand |
On Tue, Sep 11, 2018 at 11:17:07AM +0100, Suzuki K Poulose wrote: > 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 <fabio.estevam@nxp.com> > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> As per the convention we use for subject prefix, I suggest you use 'ARM: dts: imx7: ...' Shawn > --- > arch/arm/boot/dts/imx7d.dtsi | 11 ++++--- > arch/arm/boot/dts/imx7s.dtsi | 78 ++++++++++++++++++++++++++------------------ > 2 files changed, 53 insertions(+), 36 deletions(-) > > diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi > index 7cbc2ff..4ced17c 100644 > --- a/arch/arm/boot/dts/imx7d.dtsi > +++ b/arch/arm/boot/dts/imx7d.dtsi > @@ -63,9 +63,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>; > + }; > }; > }; > }; > @@ -148,11 +150,10 @@ > }; > }; > > -&ca_funnel_ports { > +&ca_funnel_in_ports { > 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 a052198..9176885 100644 > --- a/arch/arm/boot/dts/imx7s.dtsi > +++ b/arch/arm/boot/dts/imx7s.dtsi > @@ -106,7 +106,7 @@ > */ > compatible = "arm,coresight-replicator"; > > - ports { > + out-ports { > #address-cells = <1>; > #size-cells = <0>; > /* replicator output ports */ > @@ -123,12 +123,15 @@ > remote-endpoint = <&etr_in_port>; > }; > }; > + }; > > - /* replicator input port */ > - port@2 { > + in-ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > reg = <0>; > replicator_in_port0: endpoint { > - slave-mode; > remote-endpoint = <&etf_out_port>; > }; > }; > @@ -168,28 +171,31 @@ > clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>; > clock-names = "apb_pclk"; > > - ca_funnel_ports: ports { > + ca_funnel_in_ports: in-ports { > #address-cells = <1>; > #size-cells = <0>; > > - /* funnel input ports */ > port@0 { > reg = <0>; > ca_funnel_in_port0: endpoint { > - slave-mode; > remote-endpoint = <&etm0_out_port>; > }; > }; > > - /* funnel output port */ > - port@2 { > + /* the other input ports are not connect to anything */ > + }; > + > + out-ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > reg = <0>; > ca_funnel_out_port0: endpoint { > remote-endpoint = <&hugo_funnel_in_port0>; > }; > }; > > - /* the other input ports are not connect to anything */ > }; > }; > > @@ -200,9 +206,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>; > + }; > }; > }; > }; > @@ -213,15 +221,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>; > }; > }; > @@ -229,18 +235,22 @@ > 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 { > + out-ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > reg = <0>; > hugo_funnel_out_port0: endpoint { > remote-endpoint = <&etf_in_port>; > }; > }; > - > - /* the other input ports are not connect to anything */ > }; > }; > > @@ -250,19 +260,23 @@ > clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>; > clock-names = "apb_pclk"; > > - ports { > + in-ports { > #address-cells = <1>; > #size-cells = <0>; > > port@0 { > reg = <0>; > etf_in_port: endpoint { > - slave-mode; > remote-endpoint = <&hugo_funnel_out_port0>; > }; > }; > + }; > > - port@1 { > + out-ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > reg = <0>; > etf_out_port: endpoint { > remote-endpoint = <&replicator_in_port0>; > @@ -277,10 +291,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>; > + }; > }; > }; > }; > @@ -291,10 +306,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>; > + }; > }; > }; > }; > -- > 2.7.4 >
On 12/09/18 03:21, Shawn Guo wrote: > On Tue, Sep 11, 2018 at 11:17:07AM +0100, Suzuki K Poulose wrote: >> 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 <fabio.estevam@nxp.com> >> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> >> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > > As per the convention we use for subject prefix, I suggest you use > > 'ARM: dts: imx7: ...' Shawn Thanks for the suggestion. As I mentioned in the reply to the cover letter, I will update the series with this addressed. Thanks Suzuki
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index 7cbc2ff..4ced17c 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -63,9 +63,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>; + }; }; }; }; @@ -148,11 +150,10 @@ }; }; -&ca_funnel_ports { +&ca_funnel_in_ports { 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 a052198..9176885 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -106,7 +106,7 @@ */ compatible = "arm,coresight-replicator"; - ports { + out-ports { #address-cells = <1>; #size-cells = <0>; /* replicator output ports */ @@ -123,12 +123,15 @@ remote-endpoint = <&etr_in_port>; }; }; + }; - /* replicator input port */ - port@2 { + in-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { reg = <0>; replicator_in_port0: endpoint { - slave-mode; remote-endpoint = <&etf_out_port>; }; }; @@ -168,28 +171,31 @@ clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>; clock-names = "apb_pclk"; - ca_funnel_ports: ports { + ca_funnel_in_ports: in-ports { #address-cells = <1>; #size-cells = <0>; - /* funnel input ports */ port@0 { reg = <0>; ca_funnel_in_port0: endpoint { - slave-mode; remote-endpoint = <&etm0_out_port>; }; }; - /* funnel output port */ - port@2 { + /* the other input ports are not connect to anything */ + }; + + out-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { reg = <0>; ca_funnel_out_port0: endpoint { remote-endpoint = <&hugo_funnel_in_port0>; }; }; - /* the other input ports are not connect to anything */ }; }; @@ -200,9 +206,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>; + }; }; }; }; @@ -213,15 +221,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>; }; }; @@ -229,18 +235,22 @@ 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 { + out-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { reg = <0>; hugo_funnel_out_port0: endpoint { remote-endpoint = <&etf_in_port>; }; }; - - /* the other input ports are not connect to anything */ }; }; @@ -250,19 +260,23 @@ clocks = <&clks IMX7D_MAIN_AXI_ROOT_CLK>; clock-names = "apb_pclk"; - ports { + in-ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; etf_in_port: endpoint { - slave-mode; remote-endpoint = <&hugo_funnel_out_port0>; }; }; + }; - port@1 { + out-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { reg = <0>; etf_out_port: endpoint { remote-endpoint = <&replicator_in_port0>; @@ -277,10 +291,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>; + }; }; }; }; @@ -291,10 +306,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>; + }; }; }; };
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 <fabio.estevam@nxp.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> --- arch/arm/boot/dts/imx7d.dtsi | 11 ++++--- arch/arm/boot/dts/imx7s.dtsi | 78 ++++++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 36 deletions(-)