|
|
@@ -1,27 +0,0 @@
|
|
|
-From: Tobias Schramm <[email protected]>
|
|
|
-Subject: mvpp2: support fetching mac address from nvmem
|
|
|
-
|
|
|
-The mvpp2 driver did not query nvmem for hardware mac addresses. This
|
|
|
-patch adds querying of mac addresses stored in nvmem cells as a further
|
|
|
-fallback option before assigning a random address.
|
|
|
-Purposely added separately to fwnode_get_mac_address() above to maintain
|
|
|
-existing behaviour with builtin adapter mac address still taking
|
|
|
-precedence.
|
|
|
-
|
|
|
-Signed-off-by: Tobias Schramm <[email protected]>
|
|
|
----
|
|
|
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
|
|
|
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
|
|
|
-@@ -6179,6 +6179,12 @@ static int mvpp2_port_copy_mac_addr(stru
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
-+ if (!of_get_mac_address(to_of_node(fwnode), hw_mac_addr)) {
|
|
|
-+ *mac_from = "nvmem cell";
|
|
|
-+ eth_hw_addr_set(dev, hw_mac_addr);
|
|
|
-+ return 0;
|
|
|
-+ }
|
|
|
-+
|
|
|
- *mac_from = "random";
|
|
|
- eth_hw_addr_random(dev);
|
|
|
-
|