mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
86eb3de66e
This includes 5.12 fix and 5.13 improvements.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 7091e31230)
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 3559c1ea4336636c886002996d50805365d3055c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Wed, 10 Mar 2021 09:48:13 +0100
|
|
Subject: [PATCH] net: broadcom: bcm4908_enet: read MAC from OF
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm4908_enet.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- 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 pla
|
|
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 pla
|
|
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;
|