[openwrt/openwrt] lantiq: wifi mac fix for ARV752DPW

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/702366a30b8443964a3ad80287a09ddc4cc6f8e9

commit 702366a30b8443964a3ad80287a09ddc4cc6f8e9
Author: Lars Wessels <software at bytebox.org>
AuthorDate: Sat Jul 4 13:59:17 2020 +0200

    lantiq: wifi mac fix for ARV752DPW
    
    Set wifi mac from flash partition 'board_config' to
    match the label on the device (Easybox 802).
    
    Currently the wifi mac is always set to 00:0c:43:28:60:00.
    eth0 and WiFi will now share the same mac (as in original firmware).
    
    Signed-off-by: Lars Wessels <software at bytebox.org>
    [improve commit message]
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts          | 5 ++++-
 .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 069b1b1ed6..7c51f31bad 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -21,6 +21,8 @@
 		led-dsl = &internet_red;
 		led-usb = &umts;
 		led-wifi = &wifi;
+
+		label-mac-device = &wifi0;
 	};
 
 	memory at 0 {
@@ -217,9 +219,10 @@
 	interrupt-map = <0x7000 0 0 1 &icu0 135>;
 	req-mask = <0x3>;
 
-	wifi at 1814,0601 {
+	wifi0: wifi at 1814,0601 {
 		compatible = "pci1814,0601";
 		reg = <0x7000 0 0 0 0>;
+		mtd-mac-address = <&boardconfig 0x16>;
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 		ralink,mtd-eeprom-swap;
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 069b1b1ed6..7c51f31bad 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -21,6 +21,8 @@
 		led-dsl = &internet_red;
 		led-usb = &umts;
 		led-wifi = &wifi;
+
+		label-mac-device = &wifi0;
 	};
 
 	memory at 0 {
@@ -217,9 +219,10 @@
 	interrupt-map = <0x7000 0 0 1 &icu0 135>;
 	req-mask = <0x3>;
 
-	wifi at 1814,0601 {
+	wifi0: wifi at 1814,0601 {
 		compatible = "pci1814,0601";
 		reg = <0x7000 0 0 0 0>;
+		mtd-mac-address = <&boardconfig 0x16>;
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 		ralink,mtd-eeprom-swap;
 	};