Commit 52efcea5 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 33f9e6f5 589dcb8a
...@@ -10,8 +10,6 @@ Required properties: ...@@ -10,8 +10,6 @@ Required properties:
- ti,davinci-ctrl-mod-reg-offset: offset to control module register - 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-offset: offset to control module ram
- ti,davinci-ctrl-ram-size: size of 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: - interrupts: interrupt mapping for the davinci emac interrupts sources:
4 sources: <Receive Threshold Interrupt 4 sources: <Receive Threshold Interrupt
Receive Interrupt Receive Interrupt
...@@ -22,6 +20,8 @@ Optional properties: ...@@ -22,6 +20,8 @@ Optional properties:
- phy-handle: Contains a phandle to an Ethernet PHY. - phy-handle: Contains a phandle to an Ethernet PHY.
If absent, davinci_emac driver defaults to 100/FULL. If absent, davinci_emac driver defaults to 100/FULL.
- local-mac-address : 6 bytes, mac address - 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): Example (enbw_cmc board):
eth0: emac@1e20000 { eth0: emac@1e20000 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment