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/macb.txt | |
| parent | 1da2f213cfaef8e3b8a93c7779d96691d226083b (diff) | |
| download | blackbird-op-linux-d6403108aaf413c9677040c20519e5c14c2f6f7c.tar.gz blackbird-op-linux-d6403108aaf413c9677040c20519e5c14c2f6f7c.zip | |
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/macb.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/macb.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt index b5d79761ac97..1361a6daf63f 100644 --- a/Documentation/devicetree/bindings/net/macb.txt +++ b/Documentation/devicetree/bindings/net/macb.txt @@ -2,6 +2,7 @@ Required properties: - compatible: Should be "cdns,[<chip>-]{macb|gem}" + Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC. Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP available on sama5d3 SoCs. Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb". @@ -10,7 +11,9 @@ Required properties: Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs. Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs. Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs. + Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC. Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC. + 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. |
