From 1519b69f43b9424b6513379bac16fbeaa85b8a70 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 9 Feb 2026 12:00:55 -0800 Subject: [PATCH] kirkwood: remove upstreamed patch Upstream solution came with 6.4. Seems quilt refreshed it to the extent that it basically gets applied twice. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/21954 Signed-off-by: Hauke Mehrtens --- ...01-mvpp2-read-mac-address-from-nvmem.patch | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch diff --git a/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch b/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch deleted file mode 100644 index ebfa19db085..00000000000 --- a/target/linux/mvebu/patches-6.12/701-mvpp2-read-mac-address-from-nvmem.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Tobias Schramm -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 ---- ---- 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); - -- 2.47.3