From 285e636b1665f0f238da072c497f150f9acc4b54 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Sun, 9 Jan 2022 12:16:06 +0800 Subject: [PATCH] ramips: update WLAN MAC address of Phicomm K2P The wireless mac address difference of this machine is similar to that of D-Link DIR-853-R1, so use the same practice. Signed-off-by: Chukun Pan --- target/linux/ramips/dts/mt7621_phicomm_k2p.dts | 12 +++++++++++- .../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index a5060a1aee..a0bdab2226 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -96,9 +96,15 @@ }; &pcie0 { - mt76@0,0 { + wifi@0,0 { + compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; 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"; }; }; @@ -150,6 +156,10 @@ #address-cells = <1>; #size-cells = <1>; + macaddr_factory_4: macaddr@4 { + reg = <0x4 0x6>; + }; + macaddr_factory_e000: macaddr@e000 { reg = <0xe000 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 7b6827b79a..9a002d24c8 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 @@ -15,7 +15,8 @@ case "$board" in macaddr_setbit_la "$(mtd_get_mac_binary factory 0xe000)" \ > /sys${DEVPATH}/macaddress ;; - dlink,dir-853-r1) + dlink,dir-853-r1|\ + phicomm,k2p) if [ "$PHYNBR" = "0" ]; then base_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" -1) macaddr_setbit_la "$base_mac" > /sys${DEVPATH}/macaddress -- 2.30.2