From b21b98627dcd6c1868d13964f6d84e8d43ae9ef7 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Wed, 25 May 2022 22:07:10 +0200
Subject: [PATCH] ipq40xx: add Aruba AP-365 specific BDF

Aruba deploys a BDF in the root filesystem, however this matches the one
used for the DK04 reference board.

The board-specific BDFs are built into the kernel. The AP-365 shows
sinificant degraded performance with increased range when used with the
reference BDF.

Replace the BDF with the one extracted from Arubas kernel.

Signed-off-by: David Bauer <mail@david-bauer.net>
---
 package/firmware/ipq-wifi/Makefile              |   2 ++
 .../ipq-wifi/board-aruba_ap-365.qca4019         | Bin 0 -> 24316 bytes
 .../arch/arm/boot/dts/qcom-ipq4029-ap-365.dts   |   9 +++++++++
 target/linux/ipq40xx/image/generic.mk           |   2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 package/firmware/ipq-wifi/board-aruba_ap-365.qca4019

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index cd155473bb..f8445f0e33 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -25,6 +25,7 @@ endef
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
 ALLWIFIBOARDS:= \
+	aruba_ap-365 \
 	devolo_magic-2-wifi-next \
 	edgecore_ecw5410 \
 	edgecore_oap100 \
@@ -96,6 +97,7 @@ endef
 # Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 
+$(eval $(call generate-ipq-wifi-package,aruba_ap-365,Aruba AP-365))
 $(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
 $(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))
 $(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100))
diff --git a/package/firmware/ipq-wifi/board-aruba_ap-365.qca4019 b/package/firmware/ipq-wifi/board-aruba_ap-365.qca4019
new file mode 100644
index 0000000000000000000000000000000000000000..7fc44a64a3b68dc0927cb68f5995a13c134e1471
GIT binary patch
literal 24316
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

literal 0
HcmV?d00001

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
index d3cc73f388..1f7b37d56d 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts
@@ -208,3 +208,12 @@
 		};
 	};
 };
+
+&wifi0 {
+	qcom,ath10k-calibration-variant = "Aruba-AP-365";
+};
+
+&wifi1 {
+	qcom,ath10k-calibration-variant = "Aruba-AP-365";
+};
+
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index b730a0e184..44880d157c 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -185,7 +185,7 @@ TARGET_DEVICES += aruba_ap-303h
 define Device/aruba_ap-365
 	$(call Device/aruba_glenmorangie)
 	DEVICE_MODEL := AP-365
-	DEVICE_PACKAGES += kmod-hwmon-ad7418
+	DEVICE_PACKAGES := kmod-hwmon-ad7418 ipq-wifi-aruba_ap-365
 endef
 TARGET_DEVICES += aruba_ap-365
 
-- 
2.30.2