ath79: convert Netgear EX7300 caldata to nvmem

Transition to specify caldata in the DTS.

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
index fc0b6de96cef6c8535ef33b07c36473a1e167ac1..b94ccd30b7d9e74007b925ff071846747aa01069 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
@@ -121,6 +121,14 @@
 
 &pcie0 {
        status = "okay";
+
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0 0 0 0 0>;
+
+               nvmem-cells = <&macaddr_caldata_c>, <&precal_caldata_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
+       };
 };
 
 &spi {
@@ -186,9 +194,8 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&caldata 0x1000>;
-       nvmem-cells = <&macaddr_caldata_6>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_caldata_6>, <&cal_caldata_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &mdio0 {
@@ -224,4 +231,16 @@
        macaddr_caldata_6: macaddr@6 {
                reg = <0x6 0x6>;
        };
+
+       macaddr_caldata_c: macaddr@c {
+               reg = <0xc 0x6>;
+       };
+
+       cal_caldata_1000: cal@1000 {
+               reg = <0x1000 0x440>;
+       };
+
+       precal_caldata_5000: precal@5000 {
+               reg = <0x5000 0x2f20>;
+       };
 };

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 b4a2209fdf0bf6dae936f8b0d857096d7595ad9b..b0b91f1c8abf196626e8b7055b6201148750326f 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
@@ -216,10 +216,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
                ;;
-       netgear,ex7300)
-               caldata_extract "caldata" 0x5000 0x2f20
-               ath10k_patch_mac $(mtd_get_mac_binary caldata 0xc)
-               ;;
        phicomm,k2t)
                caldata_extract "art" 0x5000 0x2f20
                ath10k_patch_mac $(k2t_get_mac "5g_mac")