X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fdts%2FDIR-320-B1.dts;h=3b1f175095d82b24bdfa4b30029125bcd398cfdc;hb=8f4dfadd5a4370e455f08967bfe9b7c9125576e8;hp=2d8e402f695396759cf0e7cf391e6d102d4cb450;hpb=5722b32acf21fc6d928333fc1333d397f75c1f86;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts
index 2d8e402f69..3b1f175095 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/DIR-320-B1.dts
@@ -1,103 +1,55 @@
 /dts-v1/;
 
-/include/ "rt5350.dtsi"
+#include "rt5350.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-	compatible = "DIR-320-B1", "ralink,rt5350-soc";
+	compatible = "dlink,dir-320-b1", "ralink,rt5350-soc";
 	model = "D-Link DIR-320 B1";
 
-	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>;
-				};
-			};
-		};
-	};
-
-	pinctrl {
-		state_default: pinctrl0 {
-			gpio {
-				ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-				ralink,function = "gpio";
-			};
-		};
-	};
-
-	esw@10110000 {
-		ralink,portmap = <0x2f>;
-		ralink,led_polarity = <0x17>;
+	aliases {
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
-		status {
-			label = "d-link:green:status";
-			gpios = <&gpio0 9 1>;
+
+		led_status: status {
+			label = "dir-320-b1:green:status";
+			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
+
 		usb {
-			label = "d-link:green:usb";
-			gpios = <&gpio0 14 1>;
-		};		
+			label = "dir-320-b1:green:usb";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+		};
+
 		wps {
-			label = "d-link:green:wps";
-			gpios = <&gpio0 13 1>;
+			label = "dir-320-b1:green:wps";
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};
 
 	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>;
-			};
-		};
-	};
 
-	ehci@101c0000 {
-		status = "okay";
-	};
+		reset {
+			label = "reset";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
 
-	ohci@101c0000 {
-		status = "okay";
+		wps {
+			label = "wps";
+			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
 	};
 
 	gpio_export {
@@ -107,13 +59,82 @@
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 7 0>;
+			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 		};
-	
+
 		root_hub {
 			gpio-export,name = "root_hub";
 			gpio-export,output = <1>;
-			gpios = <&gpio0 12 0>;
+			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+		};
+	};
+};
+
+&spi0 {
+	status = "okay";
+
+	m25p80@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			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>;
+			};
+		};
+	};
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "i2c", "jtag", "uartf";
+			ralink,function = "gpio";
 		};
 	};
-}; 
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&esw {
+	mediatek,portmap = <0x2f>;
+	mediatek,led_polarity = <0x17>;
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+	status = "okay";
+};
+
+&ohci {
+	status = "okay";
+};