From f1d18ecb17b3d18299c8ebe6b1e91f1e9c77436e Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Fri, 25 Jun 2021 12:40:12 +0800
Subject: [PATCH] ipq-wifi: makefile bug fixes (#7180)

Fixes: eac26cc3530851c47e277631857232b49157995d
---
 package/firmware/ipq-wifi/Makefile                             | 2 ++
 .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata        | 3 ---
 .../linux/ipq806x/base-files/etc/init.d/{cpufreq => cpu_freq}  | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename target/linux/ipq806x/base-files/etc/init.d/{cpufreq => cpu_freq} (100%)

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index a69ebe8ea..84da94291 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -54,6 +54,8 @@ ALLWIFIBOARDS:= \
 	netgear_wac510 \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
+	p2w_r619ac \
+	qxwlan_e2600ac \
 	redmi_ax6 \
 	xiaomi_ax3600 \
 	xiaomi_ax9000
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
index dad5c7b48..4d2d564f7 100644
--- 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
@@ -48,9 +48,6 @@ case "$FIRMWARE" in
 		# OEM assigns 4 sequential MACs
 		ath10k_patch_mac $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
 		;;
-	p2w,r619ac)
-		caldata_extract "ART" 0x9000 0x2f20
-		;;
 	esac
 	;;
 "ath10k/pre-cal-ahb-a000000.wifi.bin")
diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpufreq b/target/linux/ipq806x/base-files/etc/init.d/cpu_freq
similarity index 100%
rename from target/linux/ipq806x/base-files/etc/init.d/cpufreq
rename to target/linux/ipq806x/base-files/etc/init.d/cpu_freq