diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi index e6d3813812..8010f89e66 100644 --- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi +++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dtsi @@ -243,7 +243,6 @@ nvmem-cell-names = "mac-address"; }; - band@1 { reg = <1>; nvmem-cells = <&macaddr_art_0 2>; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts index 01eee484c3..cf4ff74562 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cmcc-a10-ubootmod.dts @@ -144,6 +144,16 @@ #address-cells = <1>; #size-cells = <1>; + eeprom_factory_0: eeprom@0 { + reg = <0x0 0x1000>; + }; + + macaddr_factory_a: macaddr@a { + compatible = "mac-base"; + reg = <0xa 0x6>; + #nvmem-cell-cells = <1>; + }; + macaddr_factory_24: macaddr@24 { compatible = "mac-base"; reg = <0x24 0x6>; @@ -243,7 +253,13 @@ }; &wifi { + nvmem-cells = <&eeprom_factory_0>; + nvmem-cell-names = "eeprom"; status = "okay"; - mediatek,mtd-eeprom = <&factory 0x0>; + band@1 { + reg = <1>; + nvmem-cells = <&macaddr_factory_a 0>; + nvmem-cell-names = "mac-address"; + }; }; diff --git a/target/linux/mediatek/dts/mt7981b-konka-komi-a31.dts b/target/linux/mediatek/dts/mt7981b-konka-komi-a31.dts index a153c60f1d..ce39e07648 100644 --- a/target/linux/mediatek/dts/mt7981b-konka-komi-a31.dts +++ b/target/linux/mediatek/dts/mt7981b-konka-komi-a31.dts @@ -266,7 +266,6 @@ nvmem-cell-names = "mac-address"; }; - band@1 { reg = <1>; nvmem-cells = <&macaddr_factory_2a 2>; diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 0eb3ad4f56..05217f90b9 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -56,9 +56,6 @@ case "$board" in [ "$PHYNBR" = "0" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress ;; - cmcc,a10-ubootmod) - [ "$PHYNBR" = "1" ] && mtd_get_mac_binary Factory 0xa > /sys${DEVPATH}/macaddress - ;; cmcc,rax3000m) addr=$(cat /sys/class/net/eth0/address) [ "$PHYNBR" = "1" ] && macaddr_add $addr -1 > /sys${DEVPATH}/macaddress