From 399f862bb97295fdda0a606fdc9e5fdf813d91b3 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Wed, 17 May 2023 11:28:25 +0200
Subject: [PATCH] ipq807x: various cig,wf660a improvements

* fix wifi macs
* reset button had the wrong polarity

Signed-off-by: John Crispin <john@phrozen.org>
---
 .../etc/hotplug.d/firmware/10-ath11k-caldata    | 17 ++++++++++++++++-
 .../ipq807x/base-files/lib/upgrade/platform.sh  |  1 -
 .../dts/qcom/qcom-ipq6018-cig-wf660a-cp01.dtsi  |  9 +--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
index c1d59df20..61e207305 100755
--- a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+++ b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -58,6 +58,19 @@ ath11k_generate_macs_pax1800() {
 	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
 }
 
+ath11k_generate_macs_wf660a() {
+	touch /lib/firmware/ath11k-macs
+	mmc_dev=$(find_mmc_part 0:APPSBLENV)
+	[ -n $mmc_dev ] && mac=$(grep BaseMacAddress= $mmc_dev | cut -dx -f2)
+	eth=$(macaddr_canonicalize $mac)
+	mac1=$(macaddr_add $eth 1)
+	mac2=$(macaddr_add $eth 2)
+	mac3=$(macaddr_add $eth 3)
+	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
+	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
+	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
+}
+
 caldata_die() {
 	echo "caldata: " "$*"
 	exit 1
@@ -205,7 +218,6 @@ ath11k-macs)
 	indio,um-310ax-v1|\
 	indio,um-510axp-v1|\
 	indio,um-510axm-v1|\
-	cig,wf660a|\
 	cig,wf186w|\
 	cig,wf188n)
 		ath11k_generate_macs
@@ -219,6 +231,9 @@ ath11k-macs)
 	plasmacloud,pax1800-v2)
 		ath11k_generate_macs_pax1800
 		;;
+	cig,wf660a)
+		ath11k_generate_macs_wf660a
+		;;
 	esac
 	;;
 *)
diff --git a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh
index 337ee12db..0966160bf 100755
--- a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh
@@ -57,7 +57,6 @@ emmc_do_upgrade_bootconfig() {
 
 	local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$')
 	board_dir=${board_dir%/}
-	mount -t proc proc /proc
 	[ -f /proc/boot_info/getbinary_bootconfig ] || {
 		echo "bootconfig does not exist"
 		exit
diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cig-wf660a-cp01.dtsi b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cig-wf660a-cp01.dtsi
index 9867ad536..6a8b13baa 100755
--- a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cig-wf660a-cp01.dtsi
+++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-cig-wf660a-cp01.dtsi
@@ -424,17 +424,10 @@
 		pinctrl-0 = <&button_pins>;
 		pinctrl-names = "default";
 
-		wps {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
-			linux,input-type = <1>;
-			debounce-interval = <60>;
-		};
 		reset {
 			label = "reset";
 			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 19 GPIO_ACTIVE_HIGH>;
+			gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
 			linux,input-type = <1>;
 			debounce-interval = <60>;
 		};