From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <5bea0e95.1c69fb81.88799.a282@mx.google.com> From: Rob Herring Subject: Re: [PATCH net-next 2/2] net: nixge: Update device-tree bindings with v3.00 References: <20181029231447.3690-1-alex.williams@ettus.com> <20181029231447.3690-2-alex.williams@ettus.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181029231447.3690-2-alex.williams@ettus.com> Date: Mon, 12 Nov 2018 10:24:30 -0600 To: alex.williams@ettus.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, mark.rutland@arm.com, mdf@kernel.org, keescook@chromium.org, Alex Williams List-ID: On Mon, Oct 29, 2018 at 04:14:47PM -0700, alex.williams@ettus.com wrote: > From: Alex Williams > > Now the DMA engine is free to float elsewhere in the system map. > > Signed-off-by: Alex Williams > --- > Documentation/devicetree/bindings/net/nixge.txt | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/nixge.txt b/Documentation/devicetree/bindings/net/nixge.txt > index e55af7f0881a..d0f9fb520578 100644 > --- a/Documentation/devicetree/bindings/net/nixge.txt > +++ b/Documentation/devicetree/bindings/net/nixge.txt > @@ -1,8 +1,14 @@ > * NI XGE Ethernet controller > > Required properties: > -- compatible: Should be "ni,xge-enet-2.00" > -- reg: Address and length of the register set for the device > +- compatible: Should be "ni,xge-enet-3.00", but can be "ni,xge-enet-2.00" for > + older device trees with DMA engines co-located in the address map, > + with the one reg entry to describe the whole device. > +- reg: Address and length of the register set for the device. It contains the > + information of registers in the same order as described by reg-names. > +- reg-names: Should contain the reg names > + "dma": DMA engine control and status region > + "ctrl": MDIO and PHY control and status region > - interrupts: Should contain tx and rx interrupt > - interrupt-names: Should be "rx" and "tx" > - phy-mode: See ethernet.txt file in the same directory. > @@ -13,7 +19,9 @@ Required properties: > Examples (10G generic PHY): > nixge0: ethernet@40000000 { > compatible = "ni,xge-enet-2.00"; Shouldn't the compatible change here? > - reg = <0x40000000 0x6000>; > + reg = <0x40000000 0x4000 > + 0x41002000 0x2000>; > + reg-names = "dma", "ctrl"; > > nvmem-cells = <ð1_addr>; > nvmem-cell-names = "address"; > -- > 2.14.5 >