Commit 3559c1ea authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller

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: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ddc3229
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_net.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -620,6 +621,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) ...@@ -620,6 +621,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct net_device *netdev; struct net_device *netdev;
struct bcm4908_enet *enet; struct bcm4908_enet *enet;
const u8 *mac;
int err; int err;
netdev = devm_alloc_etherdev(dev, sizeof(*enet)); netdev = devm_alloc_etherdev(dev, sizeof(*enet));
...@@ -647,7 +649,11 @@ static int bcm4908_enet_probe(struct platform_device *pdev) ...@@ -647,7 +649,11 @@ static int bcm4908_enet_probe(struct platform_device *pdev)
return err; return err;
SET_NETDEV_DEV(netdev, &pdev->dev); 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->netdev_ops = &bcm4908_enet_netdev_ops;
netdev->min_mtu = ETH_ZLEN; netdev->min_mtu = ETH_ZLEN;
netdev->mtu = ETH_DATA_LEN; netdev->mtu = ETH_DATA_LEN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment