ath79: TP-Link EAP225-Wall v1: convert radios to nvmem-cells

Replace the mtd-cal-data phandle by an nvmem-cell reference to the art
partition for the 2.4GHz ath9k radio.

Add the PCIe node for the ath10k radio to the devicetree, and refer to
the art partition for the calibration data using nvmem-cells.

Use mac-address-increment to ensure the MAC address is set correctly,
and remove the device from the caldata extraction and patching script.

Signed-off-by: Sander Vanheule <sander@svanheule.net>

diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
index ecb427029db0272d39b1a1826554d433e78d8222..30c9441f1279161804aad43404c13e6572e5f95a 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -58,6 +58,16 @@
 
 &pcie {
        status = "okay";
+
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0 0 0 0 0>;
+
+               mac-address-increment = <1>;
+
+               nvmem-cells = <&macaddr_info_8>, <&calibration_ath10k>;
+               nvmem-cell-names = "mac-address", "calibration";
+       };
 };
 
 &spi {
@@ -121,6 +131,18 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               compatible = "nvmem-cells";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               calibration_ath9k: calibration@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               calibration_ath10k: calibration@5000 {
+                                       reg = <0x5000 0x2f20>;
+                               };
                        };
                };
        };
@@ -136,9 +158,8 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_info_8>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_info_8>, <&calibration_ath9k>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &info {

diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index ee53f3163846adb34132b365418bd561b63e483b..cb4a5797ec31457a777264ca16849f624f39f626 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -250,12 +250,6 @@ case "$FIRMWARE" in
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
-       tplink,eap225-wall-v2)
-               caldata_extract "art" 0x5000 0x2f20
-               ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) 1)
-               ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-                       /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-               ;;
        xiaomi,aiot-ac2350)
                caldata_extract "art" 0x5000 0x2f20
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \