From: Stijn Segers <foss@volatilesystems.org>
Date: Wed, 29 Oct 2025 19:26:01 +0000 (+0100)
Subject: realtek: fix Zyxel relabel
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c361c1e1b1a282289ea02506ea7097cca4e36dbe;p=openwrt%2Fstaging%2Fstintel.git

realtek: fix Zyxel relabel

Commits d205878ede and 46cf10771a relabeled the supported Zyxel devices
from v1/v2 to A1/B1, but board setup files were overlooked.

Fixes: d205878ede ("rtl838x: rename GS1900 series v1/v2 to A1/B1")
Fixes: 46cf10771a ("rtl839x: rename GS1900 series v1/v2 to A1/B1")
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Link: https://github.com/openwrt/openwrt/pull/20590
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index b8e588f286..70a44d6bac 100644
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -160,18 +160,18 @@ realtek_setup_poe()
 	netgear,gs310tp-v1)
 		ucidef_set_poe 55 "$(filter_port_list "$lan_list" "lan9 lan10")"
 		;;
-	zyxel,gs1900-10hp)
+	zyxel,gs1900-10hp-a1)
 		ucidef_set_poe 77 "$(filter_port_list "$lan_list" "lan9 lan10")"
 		;;
-	zyxel,gs1900-8hp-v1|\
-	zyxel,gs1900-8hp-v2)
+	zyxel,gs1900-8hp-a1|\
+	zyxel,gs1900-8hp-b1)
 		ucidef_set_poe 70 "$lan_list"
 		;;
-	zyxel,gs1900-24ep)
+	zyxel,gs1900-24ep-a1)
 		ucidef_set_poe 130 "lan1 lan2 lan3 lan4 lan5 lan6 lan7 lan8 lan9 lan10 lan11 lan12"
 		;;
-	zyxel,gs1900-24hp-v1|\
-	zyxel,gs1900-24hp-v2)
+	zyxel,gs1900-24hp-a1|\
+	zyxel,gs1900-24hp-b1)
 		ucidef_set_poe 170 "$(filter_port_list "$lan_list" "lan25 lan26")"
 		;;
 	esac
diff --git a/target/linux/realtek/base-files/etc/board.d/05_compat-version b/target/linux/realtek/base-files/etc/board.d/05_compat-version
index 52dbdc627e..d448681840 100644
--- a/target/linux/realtek/base-files/etc/board.d/05_compat-version
+++ b/target/linux/realtek/base-files/etc/board.d/05_compat-version
@@ -13,18 +13,18 @@ case "$(board_name)" in
 	hpe,1920-24g-poe-370w)
 		ucidef_set_compat_version "1.1"
 	;;
-	zyxel,gs1900-8-v1 | \
-	zyxel,gs1900-8-v2 | \
-	zyxel,gs1900-8hp-v1 | \
-	zyxel,gs1900-8hp-v2 | \
-	zyxel,gs1900-10hp | \
-	zyxel,gs1900-16 | \
-	zyxel,gs1900-24e | \
-	zyxel,gs1900-24ep | \
-	zyxel,gs1900-24hp-v1 | \
-	zyxel,gs1900-24hp-v2 | \
-	zyxel,gs1900-24-v1 | \
-	zyxel,gs1900-48)
+	zyxel,gs1900-8-a1 | \
+	zyxel,gs1900-8-b1 | \
+	zyxel,gs1900-8hp-a1 | \
+	zyxel,gs1900-8hp-b1 | \
+	zyxel,gs1900-10hp-a1 | \
+	zyxel,gs1900-16-a1 | \
+	zyxel,gs1900-24e-a1 | \
+	zyxel,gs1900-24ep-a1 | \
+	zyxel,gs1900-24hp-a1 | \
+	zyxel,gs1900-24hp-b1 | \
+	zyxel,gs1900-24-a1 | \
+	zyxel,gs1900-48-a1)
 		ucidef_set_compat_version "2.0"
         ;;
 esac