ath79: use nvmem-cells for radio calibration of EAP1200H

Transition from userscript to DTS for all of ART.

Signed-off-by: Michael Pratt <mcpratt@pm.me>

diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 3b3a3e3c3d2d51aa3abda3cd9e548276dbabe715..13c03e717a994dfce0fe8f2092fabd21c7920a8e 100644 (file)
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -89,18 +89,31 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&art 0x1000>;
-       nvmem-cells = <&macaddr_art_0>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_art_0>, <&calibration_ath9k>;
+       nvmem-cell-names = "mac-address", "calibration";
        mac-address-increment = <1>;
 };
 
+&ath10k {
+       status = "okay";
+
+       nvmem-cells = <&macaddr_art_0>, <&calibration_ath10k>;
+       nvmem-cell-names = "mac-address", "calibration";
+       mac-address-increment = <2>;
+};
+
 &art {
        compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
 
        macaddr_art_0: macaddr@0 {
                reg = <0x0 0x6>;
        };
+
+       calibration_ath9k: calibration@1000 {
+               reg = <0x1000 0x440>;
+       };
+
+       calibration_ath10k: calibration@5000 {
+               reg = <0x5000 0x844>;
+       };
 };

diff --git a/target/linux/ath79/dts/qca955x_senao_loader.dtsi b/target/linux/ath79/dts/qca955x_senao_loader.dtsi
index ac9f03ec652cbca8a613b340f862c2092ff4b6ac..5a8c4fb799f512708644713e089624120855911e 100644 (file)
--- a/target/linux/ath79/dts/qca955x_senao_loader.dtsi
+++ b/target/linux/ath79/dts/qca955x_senao_loader.dtsi
@@ -28,7 +28,7 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,0,0 {
+       ath10k: wifi@0,0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0 0 0 0 0>;
        };

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 8783b137cac44581e6aedbaecb4d3a37313b8f60..d03e88041aea58ca9f16de2b20ea06b7c9e01dac 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
@@ -13,7 +13,6 @@ case "$FIRMWARE" in
        allnet,all-wap02860ac|\
        araknis,an-500-ap-i-ac|\
        araknis,an-700-ap-i-ac|\
-       engenius,eap1200h|\
        engenius,enstationac-v1|\
        glinet,gl-x750|\
        watchguard,ap300)