diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-01-28 11:33:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-30 17:42:01 -0800 |
| commit | f276c0ce5d9256bb87e65f88ddea28a6a5eafdb2 (patch) | |
| tree | a474f07c34c34cfa63a1b18ab83bd03a57ab3239 /drivers/net/ethernet/ti/davinci_emac.c | |
| parent | 9120bd6e9f779d921450ec53cea02eff07003eae (diff) | |
| download | talos-obmc-linux-f276c0ce5d9256bb87e65f88ddea28a6a5eafdb2.tar.gz talos-obmc-linux-f276c0ce5d9256bb87e65f88ddea28a6a5eafdb2.zip | |
net: davinci_emac: Get device MAC on 3517
Looks like on 3517 davinci_emac MAC address registers have a
different layout compared to dm816x and am33xx.
Let's add a function to get the 3517 MAC address.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/davinci_emac.c')
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index a7169384ff6e..aeebc0a7bf47 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -52,6 +52,7 @@ #include <linux/dma-mapping.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/semaphore.h> #include <linux/phy.h> #include <linux/bitops.h> @@ -65,6 +66,7 @@ #include <linux/of_mdio.h> #include <linux/of_irq.h> #include <linux/of_net.h> +#include <linux/mfd/syscon.h> #include <asm/irq.h> #include <asm/page.h> @@ -1880,6 +1882,33 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv) return pdata; } +static int davinci_emac_3517_get_macid(struct device *dev, u16 offset, + int slave, u8 *mac_addr) +{ + u32 macid_lsb; + u32 macid_msb; + struct regmap *syscon; + + syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon"); + if (IS_ERR(syscon)) { + if (PTR_ERR(syscon) == -ENODEV) + return 0; + return PTR_ERR(syscon); + } + + regmap_read(syscon, offset, &macid_lsb); + regmap_read(syscon, offset + 4, &macid_msb); + + mac_addr[0] = (macid_msb >> 16) & 0xff; + mac_addr[1] = (macid_msb >> 8) & 0xff; + mac_addr[2] = macid_msb & 0xff; + mac_addr[3] = (macid_lsb >> 16) & 0xff; + mac_addr[4] = (macid_lsb >> 8) & 0xff; + mac_addr[5] = macid_lsb & 0xff; + + return 0; +} + static int davinci_emac_try_get_mac(struct platform_device *pdev, int instance, u8 *mac_addr) { @@ -1888,7 +1917,11 @@ static int davinci_emac_try_get_mac(struct platform_device *pdev, if (!pdev->dev.of_node) return error; - if (of_device_is_compatible(pdev->dev.of_node, "ti,dm816-emac")) + if (of_device_is_compatible(pdev->dev.of_node, "ti,am3517-emac")) + error = davinci_emac_3517_get_macid(&pdev->dev, 0x110, + 0, mac_addr); + else if (of_device_is_compatible(pdev->dev.of_node, + "ti,dm816-emac")) error = cpsw_am33xx_cm_get_macid(&pdev->dev, 0x30, instance, mac_addr); |
