Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: axienet: document axistream-connected attribute

The axienet driver requires the use of an axistream-connected attribute,
but this isn't documented in the devicetree bindings. Document how this
attribute is supposed to be used, including the upcoming change to make
the usage of this attribute optional.

Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Robert Hancock and committed by
David S. Miller
a1765c18 3b09a3fb

+15 -4
+15 -4
Documentation/devicetree/bindings/net/xilinx_axienet.txt
··· 17 17 Required properties: 18 18 - compatible : Must be one of "xlnx,axi-ethernet-1.00.a", 19 19 "xlnx,axi-ethernet-1.01.a", "xlnx,axi-ethernet-2.01.a" 20 - - reg : Address and length of the IO space. 20 + - reg : Address and length of the IO space, as well as the address 21 + and length of the AXI DMA controller IO space, unless 22 + axistream-connected is specified, in which case the reg 23 + attribute of the node referenced by it is used. 21 24 - interrupts : Should be a list of 2 or 3 interrupts: TX DMA, RX DMA, 22 - and optionally Ethernet core. 25 + and optionally Ethernet core. If axistream-connected is 26 + specified, the TX/RX DMA interrupts should be on that node 27 + instead, and only the Ethernet core interrupt is optionally 28 + specified here. 23 29 - phy-handle : Should point to the external phy device. 24 30 See ethernet.txt file in the same directory. 25 31 - xlnx,rxmem : Set to allocated memory buffer for Rx/Tx in the hardware ··· 43 37 auto-detected from the CPU clock (but only on platforms where 44 38 this is possible). New device trees should specify this - the 45 39 auto detection is only for backward compatibility. 40 + - axistream-connected: Reference to another node which contains the resources 41 + for the AXI DMA controller used by this device. 42 + If this is specified, the DMA-related resources from that 43 + device (DMA registers and DMA TX/RX interrupts) rather 44 + than this one will be used. 46 45 - mdio : Child node for MDIO bus. Must be defined if PHY access is 47 46 required through the core's MDIO interface (i.e. always, 48 47 unless the PHY is accessed through a different bus). ··· 57 46 compatible = "xlnx,axi-ethernet-1.00.a"; 58 47 device_type = "network"; 59 48 interrupt-parent = <&microblaze_0_axi_intc>; 60 - interrupts = <2 0>; 49 + interrupts = <2 0 1>; 61 50 clocks = <&axi_clk>; 62 51 phy-mode = "mii"; 63 - reg = <0x40c00000 0x40000>; 52 + reg = <0x40c00000 0x40000 0x50c00000 0x40000>; 64 53 xlnx,rxcsum = <0x2>; 65 54 xlnx,rxmem = <0x800>; 66 55 xlnx,txcsum = <0x2>;