From: Lech Perczak Date: Tue, 13 Sep 2022 21:40:06 +0000 (+0200) Subject: ath79: fix 5GHz on QCA9886 variant of ZTE MF286 X-Git-Tag: v23.05.0-rc1~92 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=25eead21c5ab;p=openwrt%2Fstaging%2Fpepe2k.git 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 --- 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