ath79: convert Araknis AN-300-AP-I-N WiFis to nvmem-cells

Pull the calibration data from the nvmem subsystem. This allows us to
move userspace caldata extraction into the device-tree definition.

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
index a886b4c0010f69e770a4d62687d88e6047cacc21..07dc8da506313c29657be6b462d756bc3907b3be 100644 (file)
--- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
+++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
@@ -87,11 +87,10 @@
        ath9k: wifi@0,0,0 {
                compatible = "pci168c,0030";
                reg = <0x0 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                mac-address-increment = <1>;
                qca,disable-5ghz;
-               qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -102,10 +101,8 @@
 
        qca,disable-2ghz;
 
-       mtd-cal-data = <&art 0x1000>;
-
-       nvmem-cells = <&macaddr_art_0>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
        mac-address-increment = <2>;
 };
 
@@ -117,4 +114,12 @@
        macaddr_art_0: macaddr@0 {
                reg = <0x0 0x6>;
        };
+
+       calibration_art_1000: calibration@1000 {
+               reg = <0x1000 0x440>;
+       };
+
+       calibration_art_5000: calibration@5000 {
+               reg = <0x5000 0x440>;
+       };
 };

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 d6d5b257ffeb1bdb53a90f21d40d921aaa9934df..52f015ed5fd9e14be1c6349287f45f192b36d1b3 100644 (file)
--- 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
@@ -83,7 +83,6 @@ case "$FIRMWARE" in
        ;;
 "ath9k-eeprom-pci-0000:00:00.0.bin")
        case $board in
-       araknis,an-300-ap-i-n|\
        atheros,db120|\
        engenius,eap600|\
        engenius,ecb600|\