aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorMichael Pratt <mcpratt@pm.me>2022-11-23 16:00:28 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 13:18:29 +0100
commit128947db42036bcc98fa7f6d70e3b2e5cb494e18 (patch)
treec492ed3ded29fc8ae916b7bb495535c427e9e9bb /target/linux/ath79
parent2c33fd39a5b84962cfc878a3561a2a51787d4c11 (diff)
downloadupstream-128947db42036bcc98fa7f6d70e3b2e5cb494e18.tar.gz
upstream-128947db42036bcc98fa7f6d70e3b2e5cb494e18.tar.bz2
upstream-128947db42036bcc98fa7f6d70e3b2e5cb494e18.zip
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>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/dts/qca9557_engenius_eap1200h.dts23
-rw-r--r--target/linux/ath79/dts/qca955x_senao_loader.dtsi2
-rw-r--r--target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata1
3 files changed, 19 insertions, 7 deletions
diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 3b3a3e3c3d..13c03e717a 100644
--- 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 ac9f03ec65..5a8c4fb799 100644
--- 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 8783b137ca..d03e88041a 100644
--- 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)