From: Mathias Kresin <dev@kresin.me>
Date: Fri, 9 Sep 2016 19:12:49 +0000 (+0200)
Subject: ramips: fix edimax 6200nl switch config
X-Git-Tag: v17.01.0-rc1~1195
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51bca43f39f0d53ef4b5facd5484347655255b12;p=oweals%2Fopenwrt.git

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 b884373325..0400e58cda 100755
--- 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 5ae43b81cb..7ef7618f68 100644
--- 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 {