mediatek: filogic: fix mt7986a-zyxel-ex5601-t0-stock.dts model name and eth1 wan...

Fix the model name to reflect the stock partitioning and the wan eth1 detection in the 02_network script.

Fixes: https://github.com/openwrt/openwrt/issues/14432
Fixes: b5df398a36f1 ("mediatek: add Zyxel EX5601-T0 with uboot custom partition")
Signed-off-by: Pietro Ameruoso <p.ameruoso@live.it>
Link: https://github.com/openwrt/openwrt/pull/17859
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit d023ee7439f6d5c9bffa6f6e10b3b90f5782e84d)

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
index 4dbbd1367794e0908c42539e84c5f2a4005de540..b5553a8359832dc50ea8830e895ed82e86910d1d 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -11,8 +11,8 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       model = "Zyxel EX5601-T0";
-       compatible = "zyxel,ex5601-t0", "mediatek,mt7986a-rfb-snand";
+       model = "Zyxel EX5601-T0 (stock layout)";
+       compatible = "zyxel,ex5601-t0-stock", "mediatek,mt7986a";
 
        memory@40000000 {
                device_type = "memory";

diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index 5048e9bb8f8b4d1dead983254066dd4b010a99ed..c2d9971f6f181b2e53f97a146d2e8fd0ca043fbf 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -126,7 +126,7 @@ xiaomi,redmi-router-ax6000-ubootmod)
 zbtlink,zbt-z8103ax)
        ucidef_set_led_netdev "wan" "wan" "green:wan" "eth1" "link tx rx"
        ;;
-zyxel_ex5601-t0-stock|\
+zyxel,ex5601-t0-stock|\
 zyxel,ex5601-t0-ubootmod)
        ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0" "link tx rx"
        ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth1" "link tx rx"

diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
index 6ee525e8d0c4cd1fa9ed0973ebf7906672d1ab36..69e39f76fc774ca8214ef72d632b511237e1a682 100644 (file)
--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
@@ -155,7 +155,7 @@ case "$board" in
        routerich,ax3000-ubootmod|\
        zbtlink,zbt-z8102ax|\
        zbtlink,zbt-z8103ax|\
-       zyxel,ex5601-t0|\
+       zyxel,ex5601-t0-stock|\
        zyxel,ex5601-t0-ubootmod)
                addr=$(mtd_get_mac_binary "Factory" 0x4)
                [ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress