X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2F3G300M.dts;h=87badf82a3a9836d7d82814d0b72ddce76051f5b;hp=42c613524c754a078b814fa4f958cbb55e5dc083;hb=HEAD;hpb=aec02c1c2753889e3794018aad363d3ff8d9498b

diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 42c613524c..87badf82a3 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -1,70 +1,88 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
 
 / {
-	#address-cells = <1>;
-	#size-cells = <1>;
 	compatible = "3G300M", "ralink,rt3052-soc";
 	model = "Tenda 3G300M";
 
-	memorydetect {
-		ralink,memory = <0x0 0x200000 0x4000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,57600 mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,3776k@0x50000(firmware)";
-	};
-
 	palmbus@10000000 {
-		sysc@0 {
-			ralink,pinmmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii";
-			ralink,gpiomux = "jtag";
-			ralink,uartmux = "gpio";
-			ralink,wdtmux = <1>;
-		};
-
-		gpio0: gpio@600 {
-			status = "okay";
-		};
-
 		spi@b00 {
 			status = "okay";
+
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
 				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <10000000>;
+
+				partition@0 {
+					label = "u-boot";
+					reg = <0x0 0x30000>;
+					read-only;
+				};
+
+				partition@30000 {
+					label = "u-boot-env";
+					reg = <0x30000 0x10000>;
+					read-only;
+				};
+
+				factory: partition@40000 {
+					label = "factory";
+					reg = <0x40000 0x10000>;
+					read-only;
+				};
+
+				partition@50000 {
+					label = "firmware";
+					reg = <0x50000 0x3b0000>;
+				};
+			};
+		};
+	};
+
+	pinctrl {
+		state_default: pinctrl0 {
+			gpio {
+				ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+				ralink,function = "gpio";
 			};
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		3grouter {
-			label = "tenda:blue:3grouter";
+			label = "3g300m:blue:3grouter";
 			gpios = <&gpio0 11 1>;
 		};
+
 		ap {
-			label = "tenda:blue:ap";
+			label = "3g300m:blue:ap";
 			gpios = <&gpio0 12 1>;
 		};
+
 		wisprouter {
-			label = "tenda:blue:wisprouter";
+			label = "3g300m:blue:wisprouter";
 			gpios = <&gpio0 9 1>;
 		};
+
 		wirelessrouter {
-			label = "tenda:blue:wirelessrouter";
+			label = "3g300m:blue:wirelessrouter";
 			gpios = <&gpio0 13 1>;
 		};
+
 		3g {
-			label = "tenda:blue:3g";
+			label = "3g300m:blue:3g";
 			gpios = <&gpio0 7 1>;
 		};
+
 		wpsreset {
-			label = "tenda:blue:wpsreset";
+			label = "3g300m:blue:wpsreset";
 			gpios = <&gpio0 14 1>;
 		};
 	};
@@ -74,11 +92,13 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
+
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
+
 		mode {
 			label = "mode";
 			gpios = <&gpio0 10 1>;
@@ -87,16 +107,15 @@
 	};
 
 	ethernet@10100000 {
-		status = "okay";
+		mtd-mac-address = <&factory 0x4>;
 	};
 
 	esw@10110000 {
-		status = "okay";
-		ralink,portmap = <0x2f>;
+		mediatek,portmap = <0x2f>;
 	};
 
 	wmac@10180000 {
-		status = "okay";
+		ralink,mtd-eeprom = <&factory 0>;
 	};
 
 	otg@101c0000 {