lantiq: homehub-v3a: assign wlan mac in dts

Userspace handling is deprecated.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16376
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index f321e0424169b8d5784b1c1eaaad7a05258c081e..b7a01ffff58f6bdf88738d49181666f7728a729d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -121,6 +121,14 @@
 
 &gsw {
        phy-mode = "rgmii";
+
+       nvmem-cells = <&macaddr_uboot_ethaddr 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&ppe {
+       nvmem-cells = <&macaddr_uboot_ethaddr 1>;
+       nvmem-cell-names = "mac-address";
 };
 
 &localbus {
@@ -154,6 +162,14 @@
                        partition@64000 {
                                label = "u-boot-env";
                                reg = <0x64000 0x004000>;
+
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_uboot_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
                        ath9k_cal: partition@68000 {
                                label = "art-copy";
@@ -182,6 +198,8 @@
        wifi@e,0 {
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
+               nvmem-cells = <&macaddr_uboot_ethaddr 2>;
+               nvmem-cell-names = "mac-address";
        };
 };
 

diff --git a/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
index 91eb3f16806ce3e7cdaf3972cdaebc77a359a2e9..2fdc5750769ae4171911737852a7cedbe918fcb5 100644 (file)
--- a/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
+++ b/target/linux/lantiq/xway/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
@@ -39,7 +39,6 @@ case "$FIRMWARE" in
                                ;;
                        bt,homehub-v3a)
                                caldata_extract_swap "art-copy" 0x0 0x1000
-                               ath9k_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 2) 0x10c
                                ;;
                        netgear,dgn3500|netgear,dgn3500b)
                                caldata_extract "calibration" 0xf000 0x1000