ipq40xx: Fix ASUS MAP-AC2200 missing BDF for QCA9888

MAP-AC2200 seems to have missing BDF for QCA9888. BDF has pullreguest: openwrt/firmware_qca-wireless#22 to add missing BDF untill it is get from kernel uppstream: https://lists.infradead.org/pipermail/ath10k/2023-December/015045.html Signed-off-by: Erkki Hietaranta <[email protected]>
sbeach92 · Dec 9, 2023 · 80db220 · 80db220
1 parent 689e4d4
commit 80db220
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
@@ -28,6 +28,7 @@ endef
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
 ALLWIFIBOARDS:= \
+	asus_map-ac2200 \
 	buffalo_wxr-5950ax12 \
 	compex_wpq873 \
 	dynalink_dl-wrx36 \
@@ -136,6 +137,7 @@ endef
 # Board files should follow this name structure:
 #   board-<devicename>.<qca4019|qca9888|qca9889|qca9984|qca99x0|ipq8074>
 
+$(eval $(call generate-ipq-wifi-package,asus_map-ac2200,ASUS MAP-AC2200))
 $(eval $(call generate-ipq-wifi-package,buffalo_wxr-5950ax12,Buffalo WXR-5950AX12))
 $(eval $(call generate-ipq-wifi-package,compex_wpq873,Compex WPQ-873))
 $(eval $(call generate-ipq-wifi-package,dynalink_dl-wrx36,Dynalink DL-WRX36))

diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -20,8 +20,6 @@ case "$FIRMWARE" in
 	case "$board" in
 	asus,map-ac2200)
 		caldata_extract_ubi "Factory" 0x9000 0x2f20
-		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
-			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
 	asus,rt-ac42u)
 		caldata_extract_ubi "Factory" 0x9000 0x2f20

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts
@@ -91,13 +91,11 @@
 
 &swport4 {
 	status = "okay";
-
 	label = "wan";
 };
 
 &swport5 {
 	status = "okay";
-
 	label = "lan";
 };
 
@@ -126,7 +124,6 @@
 
 		wifi2: wifi@1,0 {
 			compatible = "qcom,ath10k";
-			status = "okay";
 			reg = <0x00010000 0 0 0 0>;
 			qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
 			ieee80211-freq-limit = <5170000 5350000>;

diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
@@ -208,7 +208,6 @@ define Device/asus_map-ac2200
 	DEVICE_VENDOR := ASUS
 	DEVICE_MODEL := Lyra (MAP-AC2200)
 	SOC := qcom-ipq4019
-	DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k
 endef
 TARGET_DEVICES += asus_map-ac2200