X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fdts%2FWBMR.dts;h=9711a31cb2f9c1715a13dccb19bcdf6cff521ae8;hb=7bab49fd7a6a870d4b7f67edce5a9b74c5edb7d0;hp=60a750891715d4a64fd7f5b9562cf5020571ff41;hpb=07825014834a72fbdc52f193a0473a75a600e3e3;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 60a7508917..9711a31cb2 100644
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -1,12 +1,26 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
+	compatible = "buffalo,wbmr-hp-g300h", "lantiq,xway", "lantiq,ar9";
 	model = "WBMR - Buffalo WBMR-HP-G300H";
 
 	chosen {
-		bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+		bootargs = "console=ttyLTQ0,115200";
+	};
+
+	aliases {
+		led-boot = &power_green;
+		led-failsafe = &power_red;
+		led-running = &power_green;
+
+		led-dsl = &dsl;
+		led-internet = &online_green;
+		led-usb = &usb;
+		led-wifi = &wifi;
 	};
 
 	memory@0 {
@@ -22,40 +36,41 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x60000 0x1f20000>;
-				};
-
-				partition@0x1fc0000 {
-					label = "board";
-					reg = <0x1fc0000 0x20000>;
-					read-only;
-				};
-
-				partition@0x1fe0000 {
-					label = "calibration";
-					reg = <0x1fe0000 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x60000 0x1f20000>;
+					};
+
+					boardconfig: partition@1fc0000 {
+						label = "board";
+						reg = <0x1fc0000 0x20000>;
+						read-only;
+					};
+
+					partition@1fe0000 {
+						label = "calibration";
+						reg = <0x1fe0000 0x20000>;
+						read-only;
+					};
 				};
 			};
-
-			mac_addr {
-				compatible = "lantiq,eth-mac";
-				reg = <0 0x1fd0024 0x6>;
-			};
 		};
 
 		gpio: pinmux@E100B10 {
@@ -84,11 +99,12 @@
 
 		etop@E180000 {
 			phy-mode = "rgmii";
+			mtd-mac-address = <&boardconfig 0x10024>;
 		};
 
 		ifxhcd@E101000 {
 			status = "okay";
-			gpios = <&gpio 36 0>;
+			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci@E105400 {
@@ -104,64 +120,65 @@
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 0 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 37 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		eject {
 			label = "eject";
-			gpios = <&gpio 34 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_EJECTCD>;
 		};
 		movie {
 			label = "movie";
-			gpios = <&gpio 22 1>;
-			linux,code = <0x109>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VIDEO>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		power {
-			label = "power";
-			gpios = <&gpio 1 1>;
+		power_green: power {
+			label = "wbmr:green:power";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			default-state = "keep";
 		};
-		power2 {
-			label = "power2";
-			gpios = <&gpio 5 1>;
+		power_red: power2 {
+			label = "wbmr:red:power";
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		security {
-			label = "security";
-			gpios = <&gpio 14 1>;
+			label = "wbmr:yellow:security";
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
-		wifi {
-			label = "wifi";
-			gpios = <&gpio 15 1>;
+		wifi: wifi {
+			label = "wbmr:green:wireless";
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
-		dsl {
-			label = "dsl";
-			gpios = <&gpio 16 1>;
+		dsl: dsl {
+			label = "wbmr:green:dsl";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
-		online {
-			label = "online";
-			gpios = <&gpio 17 1>;
+		online_green: online {
+			label = "wbmr:green:internet";
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "online2";
-			gpios = <&gpio 18 1>;
+			label = "wbmr:red:internet";
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 		movie {
-			label = "movie";
-			gpios = <&gpio 20 1>;
+			label = "wbmr:blue:movie";
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
-		usb {
-			label = "usb";
-			gpios = <&gpio 28 1>;
+		usb: usb {
+			label = "wbmr:green:usb";
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 	};