ramips: fix edimax 6200nl switch config

With 3a9752bbd2bc00e407b5dcad21789720f40abf0e and later changes to
ramips_set_preinit_iface() the default vlan config applied during
preinit was changed. These changes were made without updating the
default network config to ensure that vlan interfaces used for lan/wan
are still configured.

Fix the issue by using the default all LAN portmap and disabling not
connected switch ports using portdisable device tree parameter.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index b88437332544107873ba6891239f3865e2a7f36b..0400e58cdac404668d005e214c0154e3b5dc2e3f 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -58,7 +58,6 @@ ramips_setup_interfaces()
                ucidef_add_switch_attr "switch0" "enable" "false"
                ucidef_set_interface_lan "eth0"
                ;;
-       3g-6200nl|\
        mlw221|\
        mr-102n)
                ucidef_set_interface_lan "eth0.2"

diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index 5ae43b81cbc77f77544fdbc45dec0cec3b54d5c3..7ef7618f6843490af97457a836eea3c8d82d0761 100644 (file)
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -81,7 +81,7 @@
 };
 
 &esw {
-       mediatek,portmap = <0x2f>;
+       mediatek,portdisable = <0x37>;
 };
 
 &wmac {