1738e87632
Drop upstreamed patches: 0001-v6.16-pinctrl-armada-37xx-use-correct-OUTPUT_VAL-register-.patch 0002-v6.16-pinctrl-armada-37xx-set-GPIO-output-value-before-set.patch 820-v6.11-01-dt-bindings-firmware-add-cznic-turris-omnia-mcu-bind.patch 820-v6.11-02-platform-cznic-Add-preliminary-support-for-Turris-Om.patch 820-v6.11-03-platform-cznic-turris-omnia-mcu-Add-support-for-MCU-.patch 820-v6.11-04-platform-cznic-turris-omnia-mcu-Add-support-for-powe.patch 820-v6.11-05-platform-cznic-turris-omnia-mcu-Add-support-for-MCU-.patch 820-v6.11-06-platform-cznic-turris-omnia-mcu-Add-support-for-MCU-.patch 820-v6.11-07-ARM-dts-turris-omnia-Add-MCU-system-controller-node.patch 820-v6.11-08-ARM-dts-turris-omnia-Add-GPIO-key-node-for-front-but.patch 820-v6.11-09-platform-cznic-turris-omnia-mcu-Depend-on-OF.patch 820-v6.11-10-platform-cznic-turris-omnia-mcu-Depend-on-WATCHDOG.patch 820-v6.11-11-platform-cznic-turris-omnia-mcu-fix-Kconfig-dependen.patch Manually refreshed: 310-linksys-use-eth0-as-cpu-port.patch 350-drivers-thermal-step_wise-add-support-for-hysteresis.patch 901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch 902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch 910-drivers-leds-wt61p803-puzzle-improvements.patch All other patches automatically refreshed. Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de> Link: https://github.com/openwrt/openwrt/pull/18975 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
27 lines
884 B
Diff
27 lines
884 B
Diff
From: Tobias Schramm <tobias@t-sys.eu>
|
|
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 <tobias@t-sys.eu>
|
|
---
|
|
--- 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);
|
|
|