From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Tue, 28 Apr 2020 03:38:51 +0000 (+0800)
Subject: ramips: fix MikroTik 750Gr3 ports MAC addresses
X-Git-Tag: v21.02.0-rc1~2931
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a10537f67400e910da153ebf3b478d931dd557f2;p=openwrt%2Fstaging%2Fchunkeey.git

ramips: fix MikroTik 750Gr3 ports MAC addresses

According to a user in OpenWrt forum, on RouterOS the MAC addresses are
ether1(WAN) = MAC
ether2(LAN2) = MAC+1
ether3(LAN3) = MAC+2
etc.

Fix the MAC addresses in OpenWrt.

Ref: https://forum.openwrt.org/t/few-dumb-question-about-mt7530-rb750gr3-dsa/61608
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
[remove label_mac in 02_network]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
index 3f37155f24..af0664a4fa 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
@@ -15,6 +15,7 @@
 		led-failsafe = &led_usr;
 		led-running = &led_usr;
 		led-upgrade = &led_usr;
+		label-mac-device = &gmac0;
 	};
 
 	chosen {
@@ -131,7 +132,6 @@
 
 &gmac0 {
 	mtd-mac-address = <&hard_config 0x0010>;
-	mtd-mac-address-increment = <1>;
 };
 
 &switch0 {
@@ -139,28 +139,34 @@
 		port@0 {
 			status = "okay";
 			label = "wan";
-			mtd-mac-address = <&hard_config 0x0010>;
-			mtd-mac-address-increment = <2>;
 		};
 
 		port@1 {
 			status = "okay";
 			label = "lan2";
+			mtd-mac-address = <&hard_config 0x0010>;
+			mtd-mac-address-increment = <1>;
 		};
 
 		port@2 {
 			status = "okay";
 			label = "lan3";
+			mtd-mac-address = <&hard_config 0x0010>;
+			mtd-mac-address-increment = <2>;
 		};
 
 		port@3 {
 			status = "okay";
 			label = "lan4";
+			mtd-mac-address = <&hard_config 0x0010>;
+			mtd-mac-address-increment = <3>;
 		};
 
 		port@4 {
 			status = "okay";
 			label = "lan5";
+			mtd-mac-address = <&hard_config 0x0010>;
+			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 952146478c..43db9c6f64 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
@@ -91,7 +91,6 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
 		label_mac=$wan_mac
 		;;
-	mikrotik,routerboard-750gr3|\
 	mikrotik,routerboard-m11g|\
 	mikrotik,routerboard-m33g)
 		label_mac=$(mtd_get_mac_binary hard_config 0x10)