ath79: convert OpenMesh OM2P v1 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.

Merge art into partition node.

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

diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
index 456724a750a18c6a805c305fd68a8153edd959c0..a66d91401509ef8daf843e4a27347dd7ef3a7bae 100644 (file)
--- a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
+++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
@@ -122,10 +122,26 @@
                                reg = <0x8c0000 0x700000>;
                        };
 
-                       art: partition@fc0000 {
+                       partition@fc0000 {
                                label = "ART";
                                reg = <0xfc0000 0x040000>;
                                read-only;
+
+                               compatible = "nvmem-cells";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_art_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_art_6: macaddr@6 {
+                                       reg = <0x6 0x6>;
+                               };
+
+                               calibration_art_1000: calibration@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
                        };
                };
        };
@@ -149,22 +165,9 @@
        wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
+               nvmem-cells = <&calibration_art_1000>;
+               nvmem-cell-names = "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

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 aa76d1bc9f87b1ea6d01230327ef1dca38926db8..ebcac0b6b29263d7d4d19a03e6292f6de89a436a 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
@@ -112,9 +112,6 @@ case "$FIRMWARE" in
        tplink,tl-wr842n-v1)
                caldata_extract "art" 0x1000 0x1000
                ;;
-       openmesh,om2p-v1)
-               caldata_extract "ART" 0x1000 0x440
-               ;;
        wd,mynet-n600|\
        wd,mynet-n750)
                caldata_extract "art" 0x5000 0x440