From: alex.williams@ettus.com
To: davem@davemloft.net
Cc: robh+dt@kernel.org, mark.rutland@arm.com, mdf@kernel.org,
mcgrof@kernel.org, keescook@chromium.org, netdev@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Williams <alex.williams@ni.com>
Subject: [PATCH v2 net-next 2/2] net: nixge: Update device-tree bindings with v3.00
Date: Thu, 31 Jan 2019 13:33:28 -0800 [thread overview]
Message-ID: <20190131213328.11236-2-alex.williams@ettus.com> (raw)
In-Reply-To: <20190131213328.11236-1-alex.williams@ettus.com>
From: Alex Williams <alex.williams@ni.com>
Now the DMA engine is free to float elsewhere in the system map.
Signed-off-by: Alex Williams <alex.williams@ni.com>
---
Documentation/devicetree/bindings/net/nixge.txt | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/nixge.txt b/Documentation/devicetree/bindings/net/nixge.txt
index e55af7f0881a..44a7358b4399 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.
@@ -12,8 +18,10 @@ Required properties:
Examples (10G generic PHY):
nixge0: ethernet@40000000 {
- compatible = "ni,xge-enet-2.00";
- reg = <0x40000000 0x6000>;
+ compatible = "ni,xge-enet-3.00";
+ reg = <0x40000000 0x4000
+ 0x41002000 0x2000>;
+ reg-names = "dma", "ctrl";
nvmem-cells = <ð1_addr>;
nvmem-cell-names = "address";
--
2.14.5
next prev parent reply other threads:[~2019-01-31 21:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 21:33 [PATCH v2 net-next 1/2] net: nixge: Separate ctrl and dma resources alex.williams
2019-01-31 21:33 ` alex.williams [this message]
2019-02-03 4:10 ` [PATCH v2 net-next 2/2] net: nixge: Update device-tree bindings with v3.00 David Miller
2019-02-03 4:10 ` [PATCH v2 net-next 1/2] net: nixge: Separate ctrl and dma resources David Miller
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=20190131213328.11236-2-alex.williams@ettus.com \
--to=alex.williams@ettus.com \
--cc=alex.williams@ni.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mcgrof@kernel.org \
--cc=mdf@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).