From d6e1008c7af5f82363ff38a2bd8f07e05485c412 Mon Sep 17 00:00:00 2001
From: mike_ding <mike_ding@sdc.sercomm.com>
Date: Tue, 27 May 2025 10:38:07 +0800
Subject: [PATCH] Support dual image and fix reset button does not work issue

Signed-off-by: mike_ding <mike_ding@sdc.sercomm.com>
---
 .../ipq53xx/base-files/lib/upgrade/platform.sh     |  6 ++----
 .../ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts     |  2 +-
 .../ipq53xx/dts/ipq5332-sercomm-ap72tip.dts        | 14 +++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
index 2d27922f4..c1d4ab2ec 100755
--- a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
+++ b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh
@@ -132,6 +132,8 @@ platform_do_upgrade() {
 
 	board=$(board_name)
 	case $board in
+	sercomm,ap72tip-v4|\
+	sercomm,ap72tip|\
 	cig,wf189w|\
 	cig,wf189h|\
 	cig,wf189)
@@ -171,10 +173,6 @@ platform_do_upgrade() {
 		sonicfi_dualimage_check
 		nand_upgrade_tar "$1"
 		;;
-	sercomm,ap72tip-v4|\
-	sercomm,ap72tip)
-		nand_upgrade_tar "$1"
-		;;
 	zyxel,nwa130be)
 		nand_upgrade_tar "$1"
 		;;
diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts
index 2778dd24e..449f365d1 100644
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts
@@ -15,7 +15,7 @@
 #include "ipq5332-default-memory.dtsi"
 
 / {
-	model = "Sercomm WiFi-7";
+	model = "Sercomm AP72TIP-v4";
 	compatible = "sercomm,ap72tip-v4", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
 
 	aliases {
diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts
index 9c3e783cd..21398f2c7 100644
--- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts
+++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts
@@ -15,7 +15,7 @@
 #include "ipq5332-default-memory.dtsi"
 
 / {
-	model = "Sercomm WiFi-7";
+	model = "Sercomm AP72TIP";
 	compatible = "sercomm,ap72tip", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
 
 	aliases {
@@ -255,7 +255,7 @@
 					gpios = <&tca6416 14 GPIO_ACTIVE_HIGH>;
 				};
 		};
-/*
+		
 		gpio_keys {
 			compatible = "gpio-keys";
 			pinctrl-0 = <&button_pins>;
@@ -263,11 +263,11 @@
 			button@1 {
 				label = "rst";
 				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
+				gpios = <&tlmm 1 GPIO_ACTIVE_LOW>;
 				linux,input-type = <1>;
 				debounce-interval = <60>;
 			};
-		};*/
+		};
 
 		wsi: wsi {
 			id = <0>;
@@ -546,13 +546,13 @@
 		drive-strength = <8>;
 		bias-pull-down;
 	};*/
-/*
+	
 	button_pins: button-state {
-		pins = "gpio25";
+		pins = "gpio1";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-pull-up;
-	};*/
+	};
 
 	pwm_pins: pwm-state {
 		pins = "gpio46";