X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-615-H1.dts;h=d53c82609f0e8d68ac10e17f5aba16da30e331cd;hb=5fba0f0c0c873e0d7179225273ceac89a5d39914;hp=13d7f88c70dec2b96dc121d4c39f8c61921ad2e2;hpb=5b437e204f2a5cf086c67b52b3751ba414ec6597;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts
index 13d7f88c70..d53c82609f 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/DIR-615-H1.dts
@@ -1,93 +1,36 @@
 /dts-v1/;
 
-/include/ "rt3352.dtsi"
+#include "rt3352.dtsi"
 
 / {
 	compatible = "DIR-615-H1", "ralink,rt3352-soc";
 	model = "D-Link DIR-615 H1";
 
-	palmbus@10000000 {
-		spi@b00 {
-			status = "okay";
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "mx25l3205d";
-				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", "uartf";
-				ralink,function = "gpio";
-			};
-			rgmii {
-				ralink,group = "rgmii";
-				ralink,function = "rgmii";
-			};
-			mdio {
-				ralink,group = "mdio";
-				ralink,function = "mdio";
-			};
-		};
-	};
-
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x28>;
-	};
-
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-	};
-
 	gpio-leds {
 		compatible = "gpio-leds";
+
 		status {
-			label = "d-link:amber:status";
+			label = "dir-615-h1:amber:status";
 			gpios = <&gpio0 7 0>;
 		};
+
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-615-h1:green:status";
 			gpios = <&gpio0 9 0>;
 		};
+
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-615-h1:amber:wan";
 			gpios = <&gpio0 12 1>;
 		};
+
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-615-h1:green:wan";
 			gpios = <&gpio0 13 1>;
 		};
+
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-615-h1:blue:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
@@ -97,11 +40,13 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
+
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
@@ -109,3 +54,70 @@
 		};
 	};
 };
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <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", "uartf";
+			ralink,function = "gpio";
+		};
+
+		rgmii {
+			ralink,group = "rgmii";
+			ralink,function = "rgmii";
+		};
+
+		mdio {
+			ralink,group = "mdio";
+			ralink,function = "mdio";
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x28>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};