net: broadcom: bcm4908_enet: read MAC from OF

BCM4908 devices have MAC address accessible using NVMEM so it's needed
to use OF helper for reading it.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index 98cf82dea3e4a1cf67d6639d7a098f6a2f3ba16e..199da299cbd0a7423184f0d8f07828582144aec2 100644 (file)
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_net.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/string.h>
@@ -620,6 +621,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct net_device *netdev;
        struct bcm4908_enet *enet;
+       const u8 *mac;
        int err;
 
        netdev = devm_alloc_etherdev(dev, sizeof(*enet));
@@ -647,7 +649,11 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
                return err;
 
        SET_NETDEV_DEV(netdev, &pdev->dev);
-       eth_hw_addr_random(netdev);
+       mac = of_get_mac_address(dev->of_node);
+       if (!IS_ERR(mac))
+               ether_addr_copy(netdev->dev_addr, mac);
+       else
+               eth_hw_addr_random(netdev);
        netdev->netdev_ops = &bcm4908_enet_netdev_ops;
        netdev->min_mtu = ETH_ZLEN;
        netdev->mtu = ETH_DATA_LEN;