From: Pavel Kubelun <be.dissent@gmail.com>
Date: Thu, 8 Jun 2017 06:06:27 +0000 (+0300)
Subject: ipq806x: qca99xx: fix wifi calibration
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=189239ade353636f9e2788cd0467bcca97bb9324;p=openwrt%2Fstaging%2Fflorian.git

ipq806x: qca99xx: fix wifi calibration

As of now OTP is being correctly parsed and the driver requires to parse pre-caldata to follow corresponding routine.

Rename cal file into pre-calfile so the board initialized correctly with API 2 board data (board-2.bin).

Also remove the now unneeded for qca9984 board.bin symlink to 5GHz calfile.

Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
---

diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
index 17ff2ca8e7..d33f650db3 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -319,9 +319,6 @@ endef
 
 define Package/ath10k-firmware-qca9984/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	ln -s \
-		../../cal-pci-0000:01:00.0.bin \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
@@ -332,9 +329,6 @@ endef
 
 define Package/ath10k-firmware-qca9984-ct/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	ln -s \
-		../../cal-pci-0000:01:00.0.bin \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 652621247f..40e1330bf0 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -61,7 +61,7 @@ case "$FIRMWARE" in
 	esac
 	;;
 
-"ath10k/cal-pci-0000:01:00.0.bin")
+"ath10k/pre-cal-pci-0000:01:00.0.bin")
 	case $board in
 	c2600)
 		ath10kcal_extract "radio" 4096 12064
@@ -84,7 +84,7 @@ case "$FIRMWARE" in
 		;;
 	esac
 	;;
-"ath10k/cal-pci-0001:01:00.0.bin")
+"ath10k/pre-cal-pci-0001:01:00.0.bin")
 	case $board in
 	c2600)
 		ath10kcal_extract "radio" 20480 12064