X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FM2M.dts;h=22ec534a2a6eba5fab80f1172f69af153e4fb98a;hb=51bca43f39f0d53ef4b5facd5484347655255b12;hp=aa98991ae1a84c8573ddcce2e4fb428e6fc609eb;hpb=88df2bd2ff5aa7b31ce9aaeda25c60e8a9b980b2;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts
index aa98991ae1..22ec534a2a 100644
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -1,71 +1,23 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#include "rt5350.dtsi"
 
 / {
 	compatible = "M2M", "ralink,rt5350-soc";
 	model = "Intenso Memory 2 Move";
 
 	chosen {
-		bootargs = "console=ttyS1,57600n8 root=/dev/mtdblock5";
-	};
-
-	palmbus@10000000 {
-		uart@500 {
-			status = "okay";
-		};
-
-		spi@b00 {
-			status = "okay";
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "mx25l6405d";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l6405d";
-				spi-max-frequency = <10000000>;
-
-				partition@0 {
-					label = "Bootloader";
-					reg = <0x0 0x30000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "Config";
-					reg = <0x30000 0x10000>;
-					read-only;
-				};
-
-				factory: partition@40000 {
-					label = "Factory";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-
-				partition@50000 {
-					label = "firmware";
-					reg = <0x50000 0x7b0000>;
-				};
-			};
-		};
-	};
-
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "jtag", "uartf";
-				ralink,function = "gpio";
-			};
-		};
+		bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		wifi {
 			label = "m2m:blue:wifi";
 			gpios = <&gpio0 7 1>;
 		};
+
 		wan {
 			label = "m2m:green:wan";
 			gpios = <&gpio0 12 1>;
@@ -73,41 +25,86 @@
 	};
 
 	gpio-keys-polled {
-		gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-			power {
-				label = "power";
-				gpios = <&gpio0 1 1>;
-				linux,code = <0x116>;
-			};
-			reset {
-				label = "reset";
-				gpios = <&gpio0 10 1>;
-				linux,code = <0x198>;
-			};
+
+		power {
+			label = "power";
+			gpios = <&gpio0 1 1>;
+			linux,code = <0x116>;
 		};
-	};
 
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x28>;
+		reset {
+			label = "reset";
+			gpios = <&gpio0 10 1>;
+			linux,code = <0x198>;
+		};
 	};
+};
 
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-	};
+&spi0 {
+	status = "okay";
 
-	ehci@101c0000 {
-		status = "okay";
-	};
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		linux,modalias = "m25p80", "mx25l6405d";
+		spi-max-frequency = <10000000>;
+
+		partition@0 {
+			label = "Bootloader";
+			reg = <0x0 0x30000>;
+			read-only;
+		};
 
-	ohci@101c1000 {
-		status = "okay";
+		partition@30000 {
+			label = "Config";
+			reg = <0x30000 0x10000>;
+			read-only;
+		};
+
+		factory: partition@40000 {
+			label = "Factory";
+			reg = <0x40000 0x10000>;
+			read-only;
+		};
+
+		partition@50000 {
+			label = "firmware";
+			reg = <0x50000 0x7b0000>;
+		};
 	};
+};
 
-	wmac@10180000 {
-		ralink,mtd-eeprom = <&factory 0x0>;
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "uartf";
+			ralink,function = "gpio";
+		};
 	};
 };
+
+&ethernet {
+	mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0x0>;
+};