Merge branch 'cpsw_macid'

Tony Lindgren says:

====================
Changes to cpsw and davinci_emac for getting MAC address

Here are a few patches to add common code for cpsw and davinci_emac for
getting the MAC address. Looks like we can also now add code to get the
MAC address on 3517 but in a slightly different way.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 116 insertions, 34 deletions

diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index 5a452fdd7c5d..c90724bded10 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -31,6 +31,7 @@
                         status = "disabled";
                         reg = <0x5c000000 0x30000>;
                         interrupts = <67 68 69 70>;
+                        syscon = <&omap3_scm_general>;
                         ti,davinci-ctrl-reg-offset = <0x10000>;
                         ti,davinci-ctrl-mod-reg-offset = <0>;
                         ti,davinci-ctrl-ram-offset = <0x20000>;
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
index 0a9813bc0451..5475cf60fa2d 100644
--- a/drivers/net/ethernet/ti/Makefile
+++ b/drivers/net/ethernet/ti/Makefile
@@ -2,6 +2,9 @@
 # Makefile for the TI network device drivers.
 #
 
+obj-$(CONFIG_TI_CPSW) += cpsw-common.o
+obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o
+
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
diff --git a/drivers/net/ethernet/ti/cpsw-common.c b/drivers/net/ethernet/ti/cpsw-common.c
new file mode 100644
index 000000000000..763ada18ad3d
--- /dev/null
+++ b/drivers/net/ethernet/ti/cpsw-common.c
@@ -0,0 +1,53 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+
+#define AM33XX_CTRL_MAC_LO_REG(offset, id) ((offset) + 0x8 * (id))
+#define AM33XX_CTRL_MAC_HI_REG(offset, id) ((offset) + 0x8 * (id) + 0x4)
+
+int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave,
+                             u8 *mac_addr)
+{
+        u32 macid_lo;
+        u32 macid_hi;
+        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, AM33XX_CTRL_MAC_LO_REG(offset, slave),
+                    &macid_lo);
+        regmap_read(syscon, AM33XX_CTRL_MAC_HI_REG(offset, slave),
+                    &macid_hi);
+
+        mac_addr[5] = (macid_lo >> 8) & 0xff;
+        mac_addr[4] = macid_lo & 0xff;
+        mac_addr[3] = (macid_hi >> 24) & 0xff;
+        mac_addr[2] = (macid_hi >> 16) & 0xff;
+        mac_addr[1] = (macid_hi >> 8) & 0xff;
+        mac_addr[0] = macid_hi & 0xff;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cpsw_am33xx_cm_get_macid);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 2b9d404f8586..7d8dd0d2182e 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -33,8 +33,6 @@
 #include <linux/of_net.h>
 #include <linux/of_device.h>
 #include <linux/if_vlan.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
 
 #include <linux/pinctrl/consumer.h>
 
@@ -1936,36 +1934,6 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv,
         slave->port_vlan = data->dual_emac_res_vlan;
 }
 
-#define AM33XX_CTRL_MAC_LO_REG(id) (0x630 + 0x8 * id)
-#define AM33XX_CTRL_MAC_HI_REG(id) (0x630 + 0x8 * id + 0x4)
-
-static int cpsw_am33xx_cm_get_macid(struct device *dev, int slave,
-                u8 *mac_addr)
-{
-        u32 macid_lo;
-        u32 macid_hi;
-        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, AM33XX_CTRL_MAC_LO_REG(slave), &macid_lo);
-        regmap_read(syscon, AM33XX_CTRL_MAC_HI_REG(slave), &macid_hi);
-
-        mac_addr[5] = (macid_lo >> 8) & 0xff;
-        mac_addr[4] = macid_lo & 0xff;
-        mac_addr[3] = (macid_hi >> 24) & 0xff;
-        mac_addr[2] = (macid_hi >> 16) & 0xff;
-        mac_addr[1] = (macid_hi >> 8) & 0xff;
-        mac_addr[0] = macid_hi & 0xff;
-
-        return 0;
-}
-
 static int cpsw_probe_dt(struct cpsw_platform_data *data,
                          struct platform_device *pdev)
 {
@@ -2090,7 +2058,8 @@ no_phy_slave:
                         memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
                 } else {
                         if (of_machine_is_compatible("ti,am33xx")) {
-                                ret = cpsw_am33xx_cm_get_macid(&pdev->dev, i,
+                                ret = cpsw_am33xx_cm_get_macid(&pdev->dev,
+                                                        0x630, i,
                                                         slave_data->mac_addr);
                                 if (ret)
                                         return ret;
diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h
index 1b710674630c..ca90efafd156 100644
--- a/drivers/net/ethernet/ti/cpsw.h
+++ b/drivers/net/ethernet/ti/cpsw.h
@@ -41,5 +41,7 @@ struct cpsw_platform_data {
 };
 
 void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave);
+int cpsw_am33xx_cm_get_macid(struct device *dev, u16 offset, int slave,
+                             u8 *mac_addr);
 
 #endif /* __CPSW_H__ */
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 5fae4354722c..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,10 +66,12 @@
 #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>
 
+#include "cpsw.h"
 #include "davinci_cpdma.h"
 
 static int debug_level;
@@ -1838,7 +1841,7 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)
         if (!is_valid_ether_addr(pdata->mac_addr)) {
                 mac_addr = of_get_mac_address(np);
                 if (mac_addr)
-                        memcpy(pdata->mac_addr, mac_addr, ETH_ALEN);
+                        ether_addr_copy(pdata->mac_addr, mac_addr);
         }
 
         of_property_read_u32(np, "ti,davinci-ctrl-reg-offset",
@@ -1879,6 +1882,53 @@ 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)
+{
+        int error = -EINVAL;
+
+        if (!pdev->dev.of_node)
+                return error;
+
+        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);
+
+        return error;
+}
+
 /**
  * davinci_emac_probe - EMAC device probe
  * @pdev: The DaVinci EMAC device that we are removing
@@ -2009,6 +2059,10 @@ static int davinci_emac_probe(struct platform_device *pdev)
         }
         ndev->irq = res->start;
 
+        rc = davinci_emac_try_get_mac(pdev, res_ctrl ? 0 : 1, priv->mac_addr);
+        if (!rc)
+                ether_addr_copy(ndev->dev_addr, priv->mac_addr);
+
         if (!is_valid_ether_addr(priv->mac_addr)) {
                 /* Use random MAC if none passed */
                 eth_hw_addr_random(ndev);