From d83f9cd54577dd79a5e5a0a02fa4f44bac5b1dd8 Mon Sep 17 00:00:00 2001
From: doveki <2290218900@qq.com>
Date: Fri, 3 Jul 2020 16:04:48 +0800
Subject: [PATCH] ramips: mt7621: update Xiaomi Mi Router 4

---
 .../linux/ramips/dts/mt7621_xiaomi_mir4.dts   | 23 ++++++++++++++++++-
 target/linux/ramips/image/mt7621.mk           |  2 ++
 .../mt7621/base-files/etc/board.d/02_network  |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir4.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir4.dts
index 62b787c3a..721497d32 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir4.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir4.dts
@@ -162,9 +162,30 @@
 };
 
 &gmac0 {
-	mtd-mac-address = <&factory 0xe000>;
+	mtd-mac-address = <&factory 0xe006>;
 };
 
+&switch0 {
+	ports {
+		port@1 {
+			status = "okay";
+			label = "lan1";
+		};
+
+		port@2 {
+			status = "okay";
+			label = "lan2";
+		};
+
+		port@4 {
+			status = "okay";
+			label = "wan";
+			mtd-mac-address = <&factory 0xe000>;
+		};
+	};
+};
+
+
 &state_default {
 	gpio {
 		groups = "jtag", "uart2", "uart3", "wdt";
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 0ccddc7c0..f0470d792 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -999,6 +999,8 @@ define Device/xiaomi_mir4
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router 4
+  SUPPORTED_DEVICES += R4
+  SUPPORTED_DEVICES += mir4
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-openssl uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mir4
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 3d8c813da..76975ce3b 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
@@ -16,13 +16,13 @@ ramips_setup_interfaces()
 	lenovo,newifi-d1|\
 	mikrotik,routerboard-m33g|\
 	xiaomi,mir3g|\
-	xiaomi,mir3g-v2)
+	xiaomi,mir3g-v2|\
+	xiaomi,mir4)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
 	gehua,ghl-r-001|\
 	hiwifi,hc5962|\
 	xiaomi,mir3p|\
-	xiaomi,mir4|\
 	xiaomi,mi-router-ac2100|\
 	xiaomi,redmi-router-ac2100)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"