From fe5786bfa4f0f1c383fc448778c8c2c327c7f40a Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 28 Aug 2021 12:21:30 +0800
Subject: [PATCH] ramips: msg1500: switch to ralink-eth driver

It seems that dsa is not stable on this machine...
---
 .../dts/mt7621_raisecom_msg1500-x-00.dts      | 35 ++++++-------------
 .../mt7621/base-files/etc/board.d/02_network  |  3 +-
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts b/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts
index 30fa8d641..3c326d60c 100644
--- a/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts
+++ b/target/linux/ramips/dts/mt7621_raisecom_msg1500-x-00.dts
@@ -114,33 +114,18 @@
 	};
 };
 
+&ethernet {
+	compatible = "mediatek,ralink-mt7621-eth";
+	mediatek,switch = <&gsw>;
+};
+
 &switch0 {
-	ports {
-		port@0 {
-			status = "okay";
-			label = "lan4";
-		};
+	/delete-property/ compatible;
+	phy-mode = "rgmii";
+};
 
-		port@1 {
-			status = "okay";
-			label = "lan3";
-		};
-
-		port@2 {
-			status = "okay";
-			label = "lan2";
-		};
-
-		port@3 {
-			status = "okay";
-			label = "lan1";
-		};
-
-		port@4 {
-			status = "okay";
-			label = "wan";
-		};
-	};
+&gsw {
+	compatible = "mediatek,ralink-mt7621-gsw";
 };
 
 &state_default {
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 f59b9aa85..f74f039c2 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -41,7 +41,8 @@ ramips_setup_interfaces()
 	xiaomi,mi-router-4a-gigabit)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
-	d-team,newifi-d2)
+	d-team,newifi-d2|\
+	raisecom,msg1500-x-00)
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
 		ucidef_set_interface_lan "eth0.1 ra0 rai0"