From cbdc2b851e7c61ca6f2c8e53075aadd703fd9e61 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 15 Jun 2024 13:48:27 -0700 Subject: [PATCH] ath79: dir-8x5: use nvmem Userspace handling is deprecated. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/20176 Signed-off-by: Robert Marko --- target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi | 11 +++-------- .../base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 5 ----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi index e4eda6cde7..891ea8fadc 100644 --- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi +++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi @@ -58,13 +58,8 @@ ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0000 0 0 0 0>; - /* "mac-address" currently does not work for - ath9k pci devices. these below are retained for future - improvements. */ - /* nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>; - nvmem-cell-names = "mac-address", "calibration"; - */ - qca,no-eeprom; /* remove this when "mac-address" works */ + nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>; + nvmem-cell-names = "mac-address", "calibration"; }; }; @@ -109,7 +104,7 @@ read-only; }; - mac: partition@fe0000 { + partition@fe0000 { label = "mac"; reg = <0xfe0000 0x010000>; read-only; 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 63f10e0de3..b04c9499f3 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 @@ -55,11 +55,6 @@ case "$FIRMWARE" in buffalo,wzr-hp-g450h) caldata_extract "art" 0x1000 0x440 ;; - dlink,dir-825-c1|\ - dlink,dir-835-a1) - caldata_extract "art" 0x5000 0x440 - ath9k_patch_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) - ;; enterasys,ws-ap3705i) caldata_extract "calibrate" 0x5000 0x440 ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env0 RADIOADDR0) -- 2.30.2