ath79: ZTE MF286A: use specific board definition file for qca9888

Using board definition file extracted from stock firmware yields 50%
throughput improvement in RX direction under iperf3 test.
Make the device use temporary files from firmware_qca-wireless.git
temporarily, as well as select the specific variant in the device tree
files.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17620
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286.dts b/target/linux/ath79/dts/qca9563_zte_mf286.dts
index 897ecf66ea8b88e951686420027c3fee150f2702..3926bacb262490e26cdea8411870a9ffb3c4a5b2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf286.dts
@@ -137,6 +137,7 @@
 &wifi_ath10k {
        nvmem-cells = <&macaddr_mac_0 1>, <&cal_caldata_5000>, <&precal_caldata_5000>;
        nvmem-cell-names = "mac-address", "calibration", "pre-calibration";
+       qcom,ath10k-calibration-variant = "ZTE-MF286AR";
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
index 9a42ea668ac6dbdc730d985dd254169ff1fe96f7..c53d6a39558cb75e33a717727c1c6b1a515be658 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
+++ b/target/linux/ath79/dts/qca9563_zte_mf286ar.dtsi
@@ -134,6 +134,7 @@
 &wifi_ath10k {
        nvmem-cells = <&macaddr_mac_0 0x20000>, <&precal_art_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
+       qcom,ath10k-calibration-variant = "ZTE-MF286AR";
 };
 
 &wmac {

diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 68cb5431872f235fa2ab66415ba9ab4b5201f0aa..34c6eccfbda300755faf871c6a1eb6ea7e582e7f 100644 (file)
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -474,6 +474,7 @@ define Device/zte_mf286
   $(Device/zte_mf28x_common)
   DEVICE_MODEL := MF286
   DEVICE_PACKAGES += ath10k-firmware-qca988x-ct ath10k-firmware-qca9888-ct \
+       -ath10k-board-qca9888 ipq-wifi-zte_mf286ar \
        kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
 endef
 TARGET_DEVICES += zte_mf286
@@ -482,6 +483,7 @@ define Device/zte_mf286a
   $(Device/zte_mf28x_common)
   DEVICE_MODEL := MF286A
   DEVICE_PACKAGES += ath10k-firmware-qca9888-ct kmod-usb-net-qmi-wwan \
+       -ath10k-board-qca9888 ipq-wifi-zte_mf286ar \
        kmod-usb-serial-option uqmi
 endef
 TARGET_DEVICES += zte_mf286a