[openwrt/openwrt] ath79: fix 5GHz on QCA9886 variant of ZTE MF286

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/25eead21c5ab3367317051fce4ebc3552c49f86f

commit 25eead21c5ab3367317051fce4ebc3552c49f86f
Author: Lech Perczak <lech.perczak at gmail.com>
AuthorDate: Tue Sep 13 23:40:06 2022 +0200

    ath79: fix 5GHz on QCA9886 variant of ZTE MF286
    
    Recently, a strange variant of ZTE MF286 was discovered, having QCA9886
    radio instead of QCA9882 - like MF286A, but having MF286 flash layout
    and rest of hardware.
    To support both variants in one image, bind calibration data at offset
    0x5000 both as "calibration" and "pre-calibration" nvmem-cells, so
    ath10k can load caldata for both at runtime.
    
    Signed-off-by: Lech Perczak <lech.perczak at gmail.com>
---
 target/linux/ath79/dts/qca9563_zte_mf286.dts | 4 ++--
 target/linux/ath79/image/nand.mk             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/ath79/dts/qca9563_zte_mf286.dts b/target/linux/ath79/dts/qca9563_zte_mf286.dts
index 2e528a6b97..877075c769 100644
--- a/target/linux/ath79/dts/qca9563_zte_mf286.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf286.dts
@@ -119,8 +119,8 @@
 };
 
 &wifi_ath10k {
-	nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>;
-	nvmem-cell-names = "mac-address", "calibration";
+	nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>, <&cal_caldata_5000>;
+	nvmem-cell-names = "mac-address", "calibration", "pre-calibration";
 	mac-address-increment = <1>;
 };
 
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index d1bd4feb1f..84a589809f 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -426,8 +426,8 @@ TARGET_DEVICES += zte_mf282
 define Device/zte_mf286
   $(Device/zte_mf28x_common)
   DEVICE_MODEL := MF286
-  DEVICE_PACKAGES += ath10k-firmware-qca988x-ct kmod-usb-net-qmi-wwan \
-	kmod-usb-serial-option uqmi
+  DEVICE_PACKAGES += ath10k-firmware-qca988x-ct ath10k-firmware-qca9888-ct \
+	kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi
 endef
 TARGET_DEVICES += zte_mf286