diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-11-30 14:51:46 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-12-09 15:30:56 -0600 |
| commit | d6403108aaf413c9677040c20519e5c14c2f6f7c (patch) | |
| tree | 0a103d4860fc43577da9cb9031e9c1b98f52d7dc /Documentation/devicetree/bindings/net/cdns-emac.txt | |
| parent | 1da2f213cfaef8e3b8a93c7779d96691d226083b (diff) | |
| download | linux-d6403108aaf413c9677040c20519e5c14c2f6f7c.tar.bz2 | |
net/macb: bindings doc: Merge cdns-emac to macb
Merge two bindings for the same driver to together.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net/cdns-emac.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/cdns-emac.txt | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Documentation/devicetree/bindings/net/cdns-emac.txt b/Documentation/devicetree/bindings/net/cdns-emac.txt deleted file mode 100644 index 4451ee973223..000000000000 --- a/Documentation/devicetree/bindings/net/cdns-emac.txt +++ /dev/null @@ -1,20 +0,0 @@ -* Cadence EMAC Ethernet controller - -Required properties: -- compatible: Should be "cdns,[<chip>-]{emac}" - Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. - Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. - Or the generic form: "cdns,emac". -- reg: Address and length of the register set for the device -- interrupts: Should contain macb interrupt -- phy-mode: see ethernet.txt file in the same directory. - -Examples: - - macb0: ethernet@fffc4000 { - compatible = "cdns,at91rm9200-emac"; - reg = <0xfffc4000 0x4000>; - interrupts = <21>; - phy-mode = "rmii"; - local-mac-address = [3a 0e 03 04 05 06]; - }; |