diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-01-15 17:45:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-16 01:00:03 -0500 |
| commit | de3900833ee635d5658415fea9c8c4e13507d777 (patch) | |
| tree | c59d439d0f3e8927101966c50bb78517c8cb0b78 | |
| parent | a1594321a9bc55ad44e02b27773cb0ed05837531 (diff) | |
net: davinci_emac: Add support for emac on dm816x
On dm816x we have two emac controllers with separate memory
areas.
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/davinci_emac.txt | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt index 032808843f90..24c5cdaba8d2 100644 --- a/Documentation/devicetree/bindings/net/davinci_emac.txt +++ b/Documentation/devicetree/bindings/net/davinci_emac.txt | |||
| @@ -4,7 +4,8 @@ This file provides information, what the device node | |||
| 4 | for the davinci_emac interface contains. | 4 | for the davinci_emac interface contains. |
| 5 | 5 | ||
| 6 | Required properties: | 6 | Required properties: |
| 7 | - compatible: "ti,davinci-dm6467-emac" or "ti,am3517-emac" | 7 | - compatible: "ti,davinci-dm6467-emac", "ti,am3517-emac" or |
| 8 | "ti,dm816-emac" | ||
| 8 | - reg: Offset and length of the register set for the device | 9 | - reg: Offset and length of the register set for the device |
| 9 | - ti,davinci-ctrl-reg-offset: offset to control register | 10 | - ti,davinci-ctrl-reg-offset: offset to control register |
| 10 | - ti,davinci-ctrl-mod-reg-offset: offset to control module register | 11 | - ti,davinci-ctrl-mod-reg-offset: offset to control module register |
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 1e5ea81504f0..5fae4354722c 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
| @@ -2120,9 +2120,14 @@ static const struct emac_platform_data am3517_emac_data = { | |||
| 2120 | .hw_ram_addr = 0x01e20000, | 2120 | .hw_ram_addr = 0x01e20000, |
| 2121 | }; | 2121 | }; |
| 2122 | 2122 | ||
| 2123 | static const struct emac_platform_data dm816_emac_data = { | ||
| 2124 | .version = EMAC_VERSION_2, | ||
| 2125 | }; | ||
| 2126 | |||
| 2123 | static const struct of_device_id davinci_emac_of_match[] = { | 2127 | static const struct of_device_id davinci_emac_of_match[] = { |
| 2124 | {.compatible = "ti,davinci-dm6467-emac", }, | 2128 | {.compatible = "ti,davinci-dm6467-emac", }, |
| 2125 | {.compatible = "ti,am3517-emac", .data = &am3517_emac_data, }, | 2129 | {.compatible = "ti,am3517-emac", .data = &am3517_emac_data, }, |
| 2130 | {.compatible = "ti,dm816-emac", .data = &dm816_emac_data, }, | ||
| 2126 | {}, | 2131 | {}, |
| 2127 | }; | 2132 | }; |
| 2128 | MODULE_DEVICE_TABLE(of, davinci_emac_of_match); | 2133 | MODULE_DEVICE_TABLE(of, davinci_emac_of_match); |