From bfcdc8711cc437f836fa529183e35c0e845da4fc Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Wed, 12 Nov 2014 14:55:00 +0000
Subject: [PATCH] ralink: fix up dts for mt7621 eval board

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43238
---
 .../ramips/base-files/etc/board.d/02_network  |  1 +
 target/linux/ramips/base-files/lib/ramips.sh  |  3 +++
 target/linux/ramips/dts/MT7621.dts            |  4 +--
 target/linux/ramips/dts/mt7621.dtsi           | 27 +++----------------
 4 files changed, 9 insertions(+), 26 deletions(-)

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 a53a032b7d..c5957b393a 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -115,6 +115,7 @@ ramips_setup_interfaces()
 	dir-320-b1 | \
 	dir-615-h1 | \
 	hlk-rm04 | \
+	mt7621 | \
 	mt7628 | \
 	mzk-w300nh2 | \
 	mzk-750dhp | \
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 7538876697..fcb8fdcf0b 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -355,6 +355,9 @@ ramips_board_detect() {
 	*"Lenovo Y1S")
 		name="y1s"
 		;;
+	*"Mediatek MT7621 evaluation board")
+		name="mt7621"
+		;;
 	*"Mediatek MT7628AN evaluation board")
 		name="mt7628"
 		;;
diff --git a/target/linux/ramips/dts/MT7621.dts b/target/linux/ramips/dts/MT7621.dts
index 834f59c401..7c7f159f01 100644
--- a/target/linux/ramips/dts/MT7621.dts
+++ b/target/linux/ramips/dts/MT7621.dts
@@ -3,8 +3,8 @@
 /include/ "mt7621.dtsi"
 
 / {
-	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
-	model = "Ralink MT7621 evaluation board";
+	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
+	model = "Mediatek MT7621 evaluation board";
 
 	memory@0 {
 		reg = <0x0 0x2000000>;
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index e00ddd2c0a..859749cce4 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -1,7 +1,7 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-	compatible = "ralink,mtk7620a-soc";
+	compatible = "mediatek,mtk7621-soc";
 
 	cpus {
 		cpu@0 {
@@ -201,28 +201,9 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		ralink,port-map = "llllw";
-		
 		interrupt-parent = <&gic>;
 		interrupts = <3>;
 
-/*		resets = <&rstctrl 21 &rstctrl 23>;
-		reset-names = "fe", "esw";
-
-		port@4 {
-			compatible = "ralink,mt7620a-gsw-port", "ralink,eth-port";
-			reg = <4>;
-
-			status = "disabled";
-		};
-
-		port@5 {
-			compatible = "ralink,mt7620a-gsw-port", "ralink,eth-port";
-			reg = <5>;
-
-			status = "disabled";
-		};
-*/
 		mdio-bus {
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -230,9 +211,6 @@
 			phy1f: ethernet-phy@1f {
 				reg = <0x1f>;
 				phy-mode = "rgmii";
-		
-				interrupt-parent = <&gic>;
-				interrupts = <23>; 
 			};
 		};
 	};
@@ -240,6 +218,7 @@
 	gsw@1e110000 {
 		compatible = "ralink,mt7620a-gsw";
 		reg = <0x1e110000 8000>;
-
+		interrupt-parent = <&gic>;
+		interrupts = <23>; 
 	};
 };
-- 
2.30.2