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 b8e588f2865483b0b9b544b35dafdbe2865f6bed..70a44d6bac9cceaf793e8bd3ee3b66b0e561c7e5 100644 (file)
--- 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 52dbdc627edfc0fbae24a34d115e9f4b86b3f044..d448681840276be5966f0495015385ec1f0e8f07 100644 (file)
--- 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