diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-29 11:42:42 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-29 11:42:42 +0400 |
| commit | 52efcea59eeae9f850e544c41764954273b0912c (patch) | |
| tree | bd2114136c6b2e1cca097f68933f2d2943b433ed | |
| parent | 33f9e6f57eb91cafcee4d8f185487bce6787957b (diff) | |
| parent | 589dcb8a3fbb9a8d12d32b0a85326cfbd9cd5735 (diff) | |
| download | linux-52efcea59eeae9f850e544c41764954273b0912c.tar.xz | |
Merge branch 'DT'
Sergei Shtylyov says:
====================
DT: net: davinci_emac: couple more properties actually optional
Though described as required, couple more properties in the DaVinci EMAC
binding are actually optional, as the driver will happily function without them.
The patchset is against DaveM's 'net.git' tree this time.
[1/2] DT: net: davinci_emac: "ti,davinci-rmii-en" property is actually optional
[2/2] DT: net: davinci_emac: "ti,davinci-no-bd-ram" property is actually optional
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/davinci_emac.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt index ca0911a20e8b..6e356d15154a 100644 --- a/Documentation/devicetree/bindings/net/davinci_emac.txt +++ b/Documentation/devicetree/bindings/net/davinci_emac.txt @@ -10,8 +10,6 @@ Required properties: - ti,davinci-ctrl-mod-reg-offset: offset to control module register - ti,davinci-ctrl-ram-offset: offset to control module ram - ti,davinci-ctrl-ram-size: size of control module ram -- ti,davinci-rmii-en: use RMII -- ti,davinci-no-bd-ram: has the emac controller BD RAM - interrupts: interrupt mapping for the davinci emac interrupts sources: 4 sources: <Receive Threshold Interrupt Receive Interrupt @@ -22,6 +20,8 @@ Optional properties: - phy-handle: Contains a phandle to an Ethernet PHY. If absent, davinci_emac driver defaults to 100/FULL. - local-mac-address : 6 bytes, mac address +- ti,davinci-rmii-en: 1 byte, 1 means use RMII +- ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM? Example (enbw_cmc board): eth0: emac@1e20000 { |