From 781f8a604b8670e45c7edbca089e88a379d9b998 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 2 Sep 2021 12:20:18 +0800 Subject: [PATCH] ramips: msg1500: fixes error mac address Fixes: b27f77f ("ramips: add support for RAISECOM MSG1500") Signed-off-by: AmadeusGhost --- .../ramips/dts/mt7621_raisecom_msg1500-x-00.dts | 13 +------------ .../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts b/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts index 13d39195a..30fa8d641 100644 --- a/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts +++ b/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts @@ -110,8 +110,7 @@ mediatek,mtd-eeprom = <&factory 0x0>; /* 5 GHz (phy1) does not take the address from calibration data, but setting it manually here works */ - nvmem-cells = <&macaddr_factory_4>; - nvmem-cell-names = "mac-address"; + mtd-mac-address = <&factory 0x4>; }; }; @@ -150,13 +149,3 @@ function = "gpio"; }; }; - -&factory { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_factory_4: macaddr@4 { - reg = <0x4 0x6>; - }; -}; diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 16a688fec..482fd885d 100644 --- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -41,7 +41,7 @@ case "$board" in ;; raisecom,msg1500-x-00) [ "$PHYNBR" = "0" ] && \ - macaddr_setbit_la "$(mtd_get_mac_ascii Config protest_lan_mac)" \ + macaddr_setbit_la "$(mtd_get_mac_ascii Config .protest_lan_mac)" \ > /sys${DEVPATH}/macaddress ;; esac