diff options
authorAlex Williams <alex.williams@ni.com>2019-01-31 13:33:28 -0800
committerDavid S. Miller <davem@davemloft.net>2019-02-02 20:09:22 -0800
commit0bb16830ebb6220f35ee9fc2c60be0958fc5be6f (patch)
parent87ab207981ec54dc2f2a1511cd2fbfc9bc6599ec (diff)
net: nixge: Update device-tree bindings with v3.00
Now the DMA engine is free to float elsewhere in the system map. Signed-off-by: Alex Williams <alex.williams@ni.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 files 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 = <&eth1_addr>;
nvmem-cell-names = "address";