From: John Crispin <john@openwrt.org>
Date: Mon, 3 Nov 2014 20:20:40 +0000 (+0000)
Subject: ralink: fix wan port on whr-1166
X-Git-Tag: v19.07.0-rc1~16085
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cc142739f2a6d447ab107fb3d12293fe8a76b8fc;p=openwrt%2Fstaging%2Fhauke.git

ralink: fix wan port on whr-1166

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43171
---

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 cedcb8bdcd..52e27c5321 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -119,13 +119,18 @@ ramips_setup_interfaces()
 	mzk-750dhp | \
 	whr-300hp2 | \
 	whr-600d | \
-	whr-1166d | \
 	wt1520)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t"
 		ucidef_add_switch_vlan "switch0" "2" "4 6t"
 		;;
+	whr-1166d)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t"
+		ucidef_add_switch_vlan "switch0" "2" "5 6t"
+		;;
 
 	awm002-evb | \
 	awm003-evb | \
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index 236987c721..1b5a3d712f 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -56,7 +56,7 @@
 	pinctrl {
 		state_default: pinctrl0 {
 			gpio {
-				ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+				ralink,group = "i2c", "uartf", "rgmii1", "wled", "nd_sd";
 				ralink,function = "gpio";
 			};
 		};
@@ -64,9 +64,22 @@
 
 	ethernet@10100000 {
 		pinctrl-names = "default";
-		pinctrl-0 = <&ephy_pins>;
+		pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
-		ralink,port-map = "llllw";
+		port@5 {
+			status = "okay";
+			phy-handle = <&phy5>;
+			phy-mode = "rgmii";
+		};
+
+		mdio-bus {
+			status = "okay";
+
+			phy5: ethernet-phy@5 {
+				reg = <5>;
+				phy-mode = "rgmii";
+			};
+		};
 	};
 
 	gsw@10110000 {