net: allow sh_eth to get mac address through platform data

Extend the sh_eth driver to allow passing the mac address
using the platform data structure. This to simplify board
setup code.

Signed-off-by: Magnus Damm <damm@opensource.se>
Tested-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h
index acf99700deed60370935b1e951bf057ba55bc623..f739061e2ee491bcabb42f04b2fc763e54e6f06a 100644 (file)
--- a/arch/sh/include/asm/sh_eth.h
+++ b/arch/sh/include/asm/sh_eth.h
@@ -7,6 +7,7 @@ struct sh_eth_plat_data {
        int phy;
        int edmac_endian;
 
+       unsigned char mac_addr[6];
        unsigned no_ether_link:1;
        unsigned ether_link_active_low:1;
 };

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index f49d0800c1d103c70bdb37f59cba9f00047b5285..a4da7e7574ebb97dbe2af5ba36958e1027a98dbf 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -298,16 +298,20 @@ static void update_mac_address(struct net_device *ndev)
  * When you want use this device, you must set MAC address in bootloader.
  *
  */
-static void read_mac_address(struct net_device *ndev)
+static void read_mac_address(struct net_device *ndev, unsigned char *mac)
 {
        u32 ioaddr = ndev->base_addr;
 
-       ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
-       ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
-       ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
-       ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
-       ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
-       ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+       if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {
+               memcpy(ndev->dev_addr, mac, 6);
+       } else {
+               ndev->dev_addr[0] = (ctrl_inl(ioaddr + MAHR) >> 24);
+               ndev->dev_addr[1] = (ctrl_inl(ioaddr + MAHR) >> 16) & 0xFF;
+               ndev->dev_addr[2] = (ctrl_inl(ioaddr + MAHR) >> 8) & 0xFF;
+               ndev->dev_addr[3] = (ctrl_inl(ioaddr + MAHR) & 0xFF);
+               ndev->dev_addr[4] = (ctrl_inl(ioaddr + MALR) >> 8) & 0xFF;
+               ndev->dev_addr[5] = (ctrl_inl(ioaddr + MALR) & 0xFF);
+       }
 }
 
 struct bb_info {
@@ -1427,7 +1431,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
        mdp->post_fw = POST_FW >> (devno << 1);
 
        /* read and set MAC address */
-       read_mac_address(ndev);
+       read_mac_address(ndev, pd->mac_addr);
 
        /* First device only init */
        if (!devno) {