From: Chen Minqiang <ptpt52@gmail.com>
Date: Fri, 22 Feb 2019 14:38:59 +0000 (+0800)
Subject: ramips: rework network settings for HC5861
X-Git-Tag: v19.07.0-rc1~1108
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e15bda603a9aad3564c46071c07b299703ec0f71;p=openwrt%2Fstaging%2Fpepe2k.git

ramips: rework network settings for HC5861

dts: disable port4 and leave it ephy mode because it connect to nothing
switch port5 connected to GE port we use it as wan port

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
---

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 8417ac68ab..6657b7273d 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -315,11 +315,14 @@ ramips_setup_interfaces()
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
 	hc5661|\
-	hc5861|\
 	y1s)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
 		;;
+	hc5861)
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "5:wan" "6@eth0"
+		;;
 	iodata,wn-ac1167gr)
 		ucidef_add_switch "switch1" \
 			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/HC5861.dts
index 09e2383e3a..76b2ce1088 100644
--- a/target/linux/ramips/dts/HC5861.dts
+++ b/target/linux/ramips/dts/HC5861.dts
@@ -72,15 +72,9 @@
 	status = "okay";
 	mtd-mac-address = <&factory 0x4>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
 	mediatek,portmap = "wllll";
 
-	port@4 {
-		status = "okay";
-		phy-handle = <&phy4>;
-		phy-mode = "rgmii";
-	};
-
 	port@5 {
 		status = "okay";
 		phy-handle = <&phy5>;
@@ -90,11 +84,6 @@
 	mdio-bus {
 		status = "okay";
 
-		phy4: ethernet-phy@4 {
-			reg = <4>;
-			phy-mode = "rgmii";
-		};
-
 		phy5: ethernet-phy@5 {
 			reg = <5>;
 			phy-mode = "rgmii";
@@ -102,18 +91,22 @@
 	};
 };
 
-&gsw {
-	mediatek,port4 = "gmac";
-};
-
 &pcie {
 	status = "okay";
 };
 
 &pcie0 {
-	mt76@0,0 {
+	wifi@0,0 {
+		compatible = "pci14c3,7662";
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
+
+&state_default {
+	gpio {
+		ralink,group = "uartf", "wled", "rgmii2", "ephy";
+		ralink,function = "gpio";
+	};
+};