X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-300-B7.dts;h=9b9a6a4592601d6c235b521afe1d80d81359ad0d;hb=296543099962be9d0896655586709249094624bd;hp=492fd4ce8ac47c47ed0450e7351982f4173e546d;hpb=5b437e204f2a5cf086c67b52b3751ba414ec6597;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts
index 492fd4ce8a..9b9a6a4592 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/DIR-300-B7.dts
@@ -1,100 +1,101 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#include "rt5350.dtsi"
 
 / {
 	compatible = "DIR-300-B7", "ralink,rt5350-soc";
 	model = "D-Link DIR-300 B7";
 
-	palmbus@10000000 {
-		spi@b00 {
-			status = "okay";
-			m25p80@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "s25fl064k";
-				reg = <0 0>;
-				linux,modalias = "m25p80", "s25fl064k";
-				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 0x7b0000>;
-				};
-			};
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		status {
+			label = "dir-300-b7:green:status";
+			gpios = <&gpio0 9 1>;
+		};
+
+		wps {
+			label = "dir-300-b7:blue:wps";
+			gpios = <&gpio0 13 1>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#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>;
+			linux,code = <0x211>;
 		};
 	};
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		linux,modalias = "m25p80", "s25fl064k";
+		spi-max-frequency = <10000000>;
 
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-				ralink,function = "gpio";
-			};
+		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 0x7b0000>;
 		};
 	};
+};
 
-	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
+			ralink,function = "gpio";
+		};
 	};
+};
 
-        esw@10110000 {
-                ralink,portmap = <0x2f>;
-                ralink,led_polarity = <0x17>;
-        };
-
-        gpio-leds {
-                compatible = "gpio-leds";
-                status {
-                        label = "d-link:green:status";
-                        gpios = <&gpio0 9 1>;
-                };
-                wps {
-                        label = "d-link:blue:wps";
-                        gpios = <&gpio0 13 1>;
-                };
-        };
-
-        gpio-keys-polled {
-                gpio-keys-polled {
-                compatible = "gpio-keys-polled";
-                #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>;
-                                linux,code = <0x211>;
-                        };
-                };
-        };
-
-        wmac@10180000 {
-                status = "okay";
-		ralink,led-polarity = <1>;
-        };
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
 };
 
+&esw {
+	mediatek,portmap = <0x2f>;
+	mediatek,led_polarity = <0x17>;
+};
+
+&wmac {
+	status = "okay";
+	ralink,led-polarity = <1>;
+	ralink,mtd-eeprom = <&factory 0>;
+};