From 6f18b30b02253ff637a8aca360f64d5d226461e7 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 17 Feb 2024 20:53:04 -0800 Subject: [PATCH] ath79: wd,mynet-nxxx: use nvmem Userspace handling is deprecated. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16285 Signed-off-by: Hauke Mehrtens --- .../linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi | 20 +++++++++++++++++-- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 10 ---------- .../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 7 +++++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi b/target/linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi index ebcf249b5dc..9241a80eda5 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi +++ b/target/linux/ath79/dts/ar9344_wd_mynet-nxxx.dtsi @@ -62,6 +62,20 @@ label = "art"; reg = <0xff0000 0x010000>; read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + cal_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; + + cal_art_5000: calibration@5000 { + reg = <0x5000 0x440>; + }; + }; }; }; }; @@ -77,12 +91,14 @@ wifi@0,0 { compatible = "pci168c,0033"; reg = <0x0000 0 0 0 0>; - qca,no-eeprom; + nvmem-cells = <&cal_art_5000>; + nvmem-cell-names = "calibration"; }; }; &wmac { status = "okay"; - qca,no-eeprom; + nvmem-cells = <&cal_art_1000>; + nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 49398a2cd63..0a98a8ef8cd 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -24,11 +24,6 @@ case "$FIRMWARE" in caldata_extract "art" 0x1000 0x440 ath9k_patch_mac $(mtd_get_mac_text "mac" 0x4) ;; - wd,mynet-n600|\ - wd,mynet-n750) - caldata_extract "art" 0x1000 0x440 - ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan24mac") - ;; engenius,ecb1200|\ engenius,ecb1750) caldata_extract "art" 0x1000 0x440 @@ -80,11 +75,6 @@ case "$FIRMWARE" in ubnt,rocket-m) caldata_extract "art" 0x1000 0x1000 ;; - wd,mynet-n600|\ - wd,mynet-n750) - caldata_extract "art" 0x5000 0x440 - ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") - ;; wd,mynet-wifi-rangeextender) caldata_extract "art" 0x1000 0x440 ath9k_patch_mac $(nvram get wl0_hwaddr) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index e667e117926..c4ae1c46b95 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -120,6 +120,13 @@ case "$board" in [ "$PHYNBR" -eq 1 ] && \ macaddr_add $base_mac 1 > /sys${DEVPATH}/macaddress ;; + wd,mynet-n600|\ + wd,mynet-n750) + [ "$PHYNBR" -eq 0 ] && \ + mtd_get_mac_ascii devdata wlan24mac > /sys${DEVPATH}/macaddress + [ "$PHYNBR" -eq 1 ] && \ + mtd_get_mac_ascii devdata wlan5mac > /sys${DEVPATH}/macaddress + ;; zyxel,nwa1123-ac) [ "$PHYNBR" -eq 0 ] && \ mtd_get_mac_text mib0 0x66 > /sys${DEVPATH}/macaddress -- 2.47.3