From: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>, Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>, Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>, Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>, Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>, Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, Nadav Haklai <nadavh-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Hanna Hawa <hannah-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Yehuda Yitschak <yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Stefan Chulski <stefanc-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Marcin Wojtas <mw-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org> Subject: Re: [PATCHv2 net-next 01/16] dt-bindings: net: update Marvell PPv2 binding for PPv2.2 support Date: Tue, 3 Jan 2017 14:18:42 -0600 [thread overview] Message-ID: <20170103201842.hdg2uzzesog2jund@rob-hp-laptop> (raw) In-Reply-To: <1482943592-12556-2-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> On Wed, Dec 28, 2016 at 05:46:17PM +0100, Thomas Petazzoni wrote: > The Marvell PPv2 Device Tree binding was so far only used to describe > the PPv2.1 network controller, used in the Marvell Armada 375. > > A new version of this IP block, PPv2.2 is used in the Marvell Armada > 7K/8K processor. This commit extends the existing binding so that it can > also be used to describe PPv2.2 hardware. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > .../devicetree/bindings/net/marvell-pp2.txt | 66 ++++++++++++++++++---- > 1 file changed, 55 insertions(+), 11 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/marvell-pp2.txt b/Documentation/devicetree/bindings/net/marvell-pp2.txt > index aa4f423..76071f3 100644 > --- a/Documentation/devicetree/bindings/net/marvell-pp2.txt > +++ b/Documentation/devicetree/bindings/net/marvell-pp2.txt > @@ -1,17 +1,28 @@ > -* Marvell Armada 375 Ethernet Controller (PPv2) > +* Marvell Armada 375 Ethernet Controller (PPv2.1) > + Marvell Armada 7K/8K Ethernet Controller (PPv2.2) > > Required properties: > > -- compatible: should be "marvell,armada-375-pp2" > +- compatible: should be one of: > + "marvell,armada-375-pp2" > + "marvell,armada-7k-pp2" > - reg: addresses and length of the register sets for the device. > - Must contain the following register sets: > + For "marvell,armada-375-pp2", must contain the following register > + sets: > - common controller registers > - LMS registers > - In addition, at least one port register set is required. > -- clocks: a pointer to the reference clocks for this device, consequently: > - - main controller clock > - - GOP clock > -- clock-names: names of used clocks, must be "pp_clk" and "gop_clk". > + - one register area per Ethernet port > + For "marvell,armda-7k-pp2", must contain the following register > + sets: > + - common controller registers > + - per-port registers > + > +- clocks: pointers to the reference clocks for this device, consequently: > + - main controller clock (for both armada-375-pp2 and armada-7k-pp2) > + - GOP clock (for both armada-375-pp2 and armada-7k-pp2) > + - MG clock (only for armada-7k-pp2) > +- clock-names: names of used clocks, must be "pp_clk", "gop_clk" and > + "mg_clk" (the latter only for armada-7k-pp2). > > The ethernet ports are represented by subnodes. At least one port is > required. > @@ -19,8 +30,9 @@ required. > Required properties (port): > > - interrupts: interrupt for the port > -- port-id: should be '0' or '1' for ethernet ports, and '2' for the > - loopback port > +- port-id: ID of the port from the MAC point of view > +- gop-port-id: only for marvell,armada-7k-pp2, ID of the port from the > + GOP (Group Of Ports) point of view What GOP is needs a better explanation. Why doesn't 375 need this? > - phy-mode: See ethernet.txt file in the same directory > > Optional properties (port): > @@ -31,7 +43,7 @@ Optional properties (port): > then fixed link is assumed, and the 'fixed-link' property is > mandatory. > > -Example: > +Example for marvell,armada-375-pp2: > > ethernet@f0000 { > compatible = "marvell,armada-375-pp2"; > @@ -59,3 +71,35 @@ ethernet@f0000 { > phy-mode = "gmii"; > }; > }; > + > +Example for marvell,armada-7k-pp2: > + > +cpm_ethernet: ethernet@0 { > + compatible = "marvell,armada-7k-pp22"; > + reg = <0x0 0x100000>, > + <0x100000 0x80000>; > + clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>; > + clock-names = "pp_clk", "gop_clk", "gp_clk"; > + status = "disabled"; Drop status from examples. > + > + eth0: eth@0 { unit address requires a reg property. Or this can be 'eth0' instead. > + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <0>; > + gop-port-id = <0>; > + status = "disabled"; > + }; > + > + eth1: eth@1 { > + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <1>; > + gop-port-id = <2>; > + status = "disabled"; > + }; > + > + eth2: eth@2 { > + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <2>; > + gop-port-id = <3>; > + status = "disabled"; > + }; > +}; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: robh@kernel.org (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 net-next 01/16] dt-bindings: net: update Marvell PPv2 binding for PPv2.2 support Date: Tue, 3 Jan 2017 14:18:42 -0600 [thread overview] Message-ID: <20170103201842.hdg2uzzesog2jund@rob-hp-laptop> (raw) In-Reply-To: <1482943592-12556-2-git-send-email-thomas.petazzoni@free-electrons.com> On Wed, Dec 28, 2016 at 05:46:17PM +0100, Thomas Petazzoni wrote: > The Marvell PPv2 Device Tree binding was so far only used to describe > the PPv2.1 network controller, used in the Marvell Armada 375. > > A new version of this IP block, PPv2.2 is used in the Marvell Armada > 7K/8K processor. This commit extends the existing binding so that it can > also be used to describe PPv2.2 hardware. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > .../devicetree/bindings/net/marvell-pp2.txt | 66 ++++++++++++++++++---- > 1 file changed, 55 insertions(+), 11 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/marvell-pp2.txt b/Documentation/devicetree/bindings/net/marvell-pp2.txt > index aa4f423..76071f3 100644 > --- a/Documentation/devicetree/bindings/net/marvell-pp2.txt > +++ b/Documentation/devicetree/bindings/net/marvell-pp2.txt > @@ -1,17 +1,28 @@ > -* Marvell Armada 375 Ethernet Controller (PPv2) > +* Marvell Armada 375 Ethernet Controller (PPv2.1) > + Marvell Armada 7K/8K Ethernet Controller (PPv2.2) > > Required properties: > > -- compatible: should be "marvell,armada-375-pp2" > +- compatible: should be one of: > + "marvell,armada-375-pp2" > + "marvell,armada-7k-pp2" > - reg: addresses and length of the register sets for the device. > - Must contain the following register sets: > + For "marvell,armada-375-pp2", must contain the following register > + sets: > - common controller registers > - LMS registers > - In addition, at least one port register set is required. > -- clocks: a pointer to the reference clocks for this device, consequently: > - - main controller clock > - - GOP clock > -- clock-names: names of used clocks, must be "pp_clk" and "gop_clk". > + - one register area per Ethernet port > + For "marvell,armda-7k-pp2", must contain the following register > + sets: > + - common controller registers > + - per-port registers > + > +- clocks: pointers to the reference clocks for this device, consequently: > + - main controller clock (for both armada-375-pp2 and armada-7k-pp2) > + - GOP clock (for both armada-375-pp2 and armada-7k-pp2) > + - MG clock (only for armada-7k-pp2) > +- clock-names: names of used clocks, must be "pp_clk", "gop_clk" and > + "mg_clk" (the latter only for armada-7k-pp2). > > The ethernet ports are represented by subnodes. At least one port is > required. > @@ -19,8 +30,9 @@ required. > Required properties (port): > > - interrupts: interrupt for the port > -- port-id: should be '0' or '1' for ethernet ports, and '2' for the > - loopback port > +- port-id: ID of the port from the MAC point of view > +- gop-port-id: only for marvell,armada-7k-pp2, ID of the port from the > + GOP (Group Of Ports) point of view What GOP is needs a better explanation. Why doesn't 375 need this? > - phy-mode: See ethernet.txt file in the same directory > > Optional properties (port): > @@ -31,7 +43,7 @@ Optional properties (port): > then fixed link is assumed, and the 'fixed-link' property is > mandatory. > > -Example: > +Example for marvell,armada-375-pp2: > > ethernet at f0000 { > compatible = "marvell,armada-375-pp2"; > @@ -59,3 +71,35 @@ ethernet at f0000 { > phy-mode = "gmii"; > }; > }; > + > +Example for marvell,armada-7k-pp2: > + > +cpm_ethernet: ethernet at 0 { > + compatible = "marvell,armada-7k-pp22"; > + reg = <0x0 0x100000>, > + <0x100000 0x80000>; > + clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>; > + clock-names = "pp_clk", "gop_clk", "gp_clk"; > + status = "disabled"; Drop status from examples. > + > + eth0: eth at 0 { unit address requires a reg property. Or this can be 'eth0' instead. > + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <0>; > + gop-port-id = <0>; > + status = "disabled"; > + }; > + > + eth1: eth at 1 { > + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <1>; > + gop-port-id = <2>; > + status = "disabled"; > + }; > + > + eth2: eth at 2 { > + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; > + port-id = <2>; > + gop-port-id = <3>; > + status = "disabled"; > + }; > +}; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-01-03 20:18 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-28 16:46 [PATCHv2 net-next 00/16] net: mvpp2: add basic support for PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni [not found] ` <1482943592-12556-1-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2016-12-28 16:46 ` [PATCHv2 net-next 01/16] dt-bindings: net: update Marvell PPv2 binding for PPv2.2 support Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni [not found] ` <1482943592-12556-2-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-01-03 20:18 ` Rob Herring [this message] 2017-01-03 20:18 ` Rob Herring 2017-02-02 16:56 ` Thomas Petazzoni 2017-02-02 16:56 ` Thomas Petazzoni 2017-02-03 16:48 ` Russell King - ARM Linux 2017-02-03 16:48 ` Russell King - ARM Linux 2017-02-14 14:25 ` Thomas Petazzoni 2017-02-14 14:25 ` Thomas Petazzoni [not found] ` <20170214152503.602878cb-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-02-21 10:12 ` Thomas Petazzoni 2017-02-21 10:12 ` Thomas Petazzoni 2017-01-07 9:32 ` Russell King - ARM Linux 2017-01-07 9:32 ` Russell King - ARM Linux 2017-02-02 16:44 ` Thomas Petazzoni 2017-02-02 16:44 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 02/16] net: mvpp2: add and use accessors for TX/RX descriptors Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 03/16] net: mvpp2: add hw_version field in "struct mvpp2" Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 07/16] net: mvpp2: adapt the mvpp2_rxq_*_pool_set functions to PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 14/16] net: mvpp2: adapt rxq distribution " Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 16/16] net: mvpp2: finally add the PPv2.2 compatible string Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 17:06 ` [PATCHv2 net-next 00/16] net: mvpp2: add basic support for PPv2.2 David Miller 2016-12-28 17:06 ` David Miller [not found] ` <20161228.120644.1166014191192724301.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 2016-12-28 21:08 ` Thomas Petazzoni 2016-12-28 21:08 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 04/16] net: mvpp2: introduce an intermediate union for the TX/RX descriptors Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 05/16] net: mvpp2: introduce PPv2.2 HW descriptors and adapt accessors Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2017-01-06 14:29 ` Russell King - ARM Linux 2017-01-06 14:29 ` Russell King - ARM Linux 2017-01-06 14:44 ` Robin Murphy 2017-01-06 14:44 ` Robin Murphy [not found] ` <113811b6-79a4-9c66-d302-add9fb0c5b1a-5wv7dgnIgG8@public.gmane.org> 2017-02-03 13:24 ` Thomas Petazzoni 2017-02-03 13:24 ` Thomas Petazzoni 2017-02-03 14:05 ` Robin Murphy 2017-02-03 14:05 ` Robin Murphy [not found] ` <231514f4-2e35-8bde-4469-aada833635aa-5wv7dgnIgG8@public.gmane.org> 2017-02-03 15:02 ` Thomas Petazzoni 2017-02-03 15:02 ` Thomas Petazzoni [not found] ` <20170203160227.08b40c58-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-02-03 16:31 ` Robin Murphy 2017-02-03 16:31 ` Robin Murphy 2017-02-03 15:54 ` Russell King - ARM Linux 2017-02-03 15:54 ` Russell King - ARM Linux 2017-02-04 13:59 ` Thomas Petazzoni 2017-02-04 13:59 ` Thomas Petazzoni 2017-02-06 12:43 ` David Laight 2017-02-06 12:43 ` David Laight 2017-02-06 12:43 ` David Laight 2016-12-28 16:46 ` [PATCHv2 net-next 06/16] net: mvpp2: adjust the allocation/free of BM pools for PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2017-01-06 14:32 ` Russell King - ARM Linux 2017-01-06 14:32 ` Russell King - ARM Linux 2016-12-28 16:46 ` [PATCHv2 net-next 08/16] net: mvpp2: adapt mvpp2_defaults_set() to PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 09/16] net: mvpp2: adjust mvpp2_{rxq,txq}_init for PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 09/16] net: mvpp2: adjust mvpp2_{rxq, txq}_init " Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 10/16] net: mvpp2: handle register mapping and access " Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2017-01-06 14:46 ` Russell King - ARM Linux 2017-01-06 14:46 ` Russell King - ARM Linux [not found] ` <20170106144648.GE14217-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org> 2017-03-02 8:45 ` Thomas Petazzoni 2017-03-02 8:45 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 11/16] net: mvpp2: handle misc PPv2.1/PPv2.2 differences Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2017-01-07 9:38 ` Russell King - ARM Linux 2017-01-07 9:38 ` Russell King - ARM Linux [not found] ` <20170107093834.GJ14217-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org> 2017-01-07 20:10 ` Russell King - ARM Linux 2017-01-07 20:10 ` Russell King - ARM Linux 2017-02-14 14:53 ` Thomas Petazzoni 2017-02-14 14:53 ` Thomas Petazzoni 2017-01-07 11:03 ` Russell King - ARM Linux 2017-01-07 11:03 ` Russell King - ARM Linux 2017-01-07 12:12 ` Marcin Wojtas 2017-01-07 12:12 ` Marcin Wojtas [not found] ` <CAPv3WKeQ=fj2cKPyJ2NqCaAv55cOyWodujKwj3-v5iCrDYNcmA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-01-07 13:50 ` Russell King - ARM Linux 2017-01-07 13:50 ` Russell King - ARM Linux 2017-01-07 13:50 ` Russell King - ARM Linux 2016-12-28 16:46 ` [PATCHv2 net-next 12/16] net: mvpp2: add AXI bridge initialization for PPv2.2 Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 13/16] net: mvpp2: rework RXQ interrupt group " Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni 2016-12-28 16:46 ` [PATCHv2 net-next 15/16] net: mvpp2: add support for an additional clock needed " Thomas Petazzoni 2016-12-28 16:46 ` Thomas Petazzoni [not found] ` <1482943592-12556-16-git-send-email-thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> 2017-01-07 9:29 ` Russell King - ARM Linux 2017-01-07 9:29 ` Russell King - ARM Linux
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170103201842.hdg2uzzesog2jund@rob-hp-laptop \ --to=robh-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \ --cc=andrew-g2DYL2Zd6BY@public.gmane.org \ --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \ --cc=gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=hannah-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org \ --cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \ --cc=mw-nYOzD4b6Jr9Wk0Htik3J/w@public.gmane.org \ --cc=nadavh-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=pawel.moll-5wv7dgnIgG8@public.gmane.org \ --cc=sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=stefanc-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.