From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Thu, 19 Mar 2020 11:33:27 +0000 (+0800)
Subject: ramips: mt7621: fix Ubiquiti ER-X ports names and MAC addresses
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5acd1ed0be0d78847cd7d9d5599526f59babaf4d;p=openwrt%2Fstaging%2Flinusw.git

ramips: mt7621: fix Ubiquiti ER-X ports names and MAC addresses

The name of each user port should be eth0..4, instead of lan1..4
and there is no WAN port. Rename them to match the official firmware.
To avoid conflict with the master port (gmac0), rename it to "dsa".

The official firmware assigns MAC address in this way:
eth0 = label mac
eth1 = label mac + 1
...
eth4 = label mac + 4

Since we have switched to DSA, it's possible to use different MAC for each port.

Acked-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
---

diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
index 6fed4a0b7b..b10953f45e 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi
@@ -25,35 +25,42 @@
 
 &gmac0 {
 	mtd-mac-address = <&factory 0x22>;
+	label = "dsa";
 };
 
 &switch0 {
 	ports {
 		port@0 {
 			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <1>;
+			label = "eth0";
 		};
 
 		port@1 {
 			status = "okay";
-			label = "lan1";
+			label = "eth1";
+			mtd-mac-address = <&factory 0x22>;
+			mtd-mac-address-increment = <1>;
 		};
 
 		port@2 {
 			status = "okay";
-			label = "lan2";
+			label = "eth2";
+			mtd-mac-address = <&factory 0x22>;
+			mtd-mac-address-increment = <2>;
 		};
 
 		port@3 {
 			status = "okay";
-			label = "lan3";
+			label = "eth3";
+			mtd-mac-address = <&factory 0x22>;
+			mtd-mac-address-increment = <3>;
 		};
 
 		port@4 {
 			status = "okay";
-			label = "lan4";
+			label = "eth4";
+			mtd-mac-address = <&factory 0x22>;
+			mtd-mac-address-increment = <4>;
 		};
 	};
 };
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 6205fab301..e2a8a9392d 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -39,6 +39,10 @@ ramips_setup_interfaces()
 	ubnt,unifi-nanohd)
 		ucidef_set_interface_lan "lan"
 		;;
+	ubiquiti,edgerouterx|\
+	ubiquiti,edgerouterx-sfp)
+		ucidef_set_interface_lan "eth0 eth1 eth2 eth3 eth4"
+		;;
 	*)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;