X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fdts%2FARV4520PW.dts;h=030e316c87091bbc6ac0cf3ac36f260425731eea;hp=299d13c4d4408fa5d868cf2c270db7d970cc8d08;hb=d8dde8c5178eba8c847dd48e7d06e6663ba1979f;hpb=b7fc892eb56b52d25bc00578af9d1ee058dcf6b3

diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 299d13c4d4..030e316c87 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -1,23 +1,25 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "ARV4520PW - Easybox 800, WAV-281";
 
 	chosen {
-		bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+		bootargs = "console=ttyLTQ0,115200";
+	};
 
-		leds {
-			boot = &power_blue;
-			failsafe = &power_red;
-			running = &power_blue;
+	aliases {
+		led-boot = &power_blue;
+		led-failsafe = &power_red;
+		led-running = &power_blue;
 
-			dsl = &dsl;
-			internet = &internet_blue;
-			usb = &usb;
-			wifi = &wifi;
-		};
+		led-dsl = &dsl;
+		led-internet = &internet_blue;
+		led-usb = &usb;
+		led-wifi = &wifi;
 	};
 
 	memory@0 {
@@ -27,8 +29,8 @@
 	sram@1F000000 {
 		vmmc@107000 {
 			status = "okay";
-			gpios = <&gpio 31 0
-				&gpiomm 7 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+				&gpiomm 7 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -63,7 +65,7 @@
 						reg = <0x30000 0x3c0000>;
 					};
 
-					partition@7f0000 {
+					boardconfig: partition@7f0000 {
 						label = "boardconfig";
 						reg = <0x3f0000 0x10000>;
 						read-only;
@@ -71,12 +73,6 @@
 				};
 			};
 
-			mac_addr {
-				compatible = "lantiq,eth-mac";
-				reg = <0 0x3f0016 0x6>;
-				mac-increment = <2>;
-			};
-
 			gpiomm: gpiomm@4000000 {
 				compatible = "lantiq,gpio-mm";
 				reg = <1 0x0 0x10 >;
@@ -119,19 +115,19 @@
 
 		etop@E180000 {
 			phy-mode = "rmii";
+			mtd-mac-address = <&boardconfig 0x16>;
 		};
 
 		ifxhcd@E101000 {
 			status = "okay";
-                        gpios = <&gpio 28 0>;
+			gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci@E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
-
 	};
 
 // gpiomm 10 - switch
@@ -144,13 +140,13 @@
 
 		rfkill {
 			label = "wps";
-			gpios = <&gpio 29 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -159,63 +155,63 @@
 
 		power_blue: power {
 			label = "arv4520pw:blue:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
 			label = "arv4520pw:blue:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_blue: internet {
 			label = "arv4520pw:blue:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
 			label = "arv4520pw:red:power";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "arv4520pw:yellow:wps";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
 			label = "arv4520pw:red:wps";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			wps green is missing
 		*/
 		fxs1 {
 			label = "arv4520pw:blue:telefon1";
-			gpios = <&gpiomm 0 1>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv4520pw:blue:telefon2";
-			gpios = <&gpiomm 1 1>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
 			label = "arv4520pw:blue:isdn";
-			gpios = <&gpiomm 2 1>;
+			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "arv4520pw:blue:line";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "arv4520pw:blue:sprache";
-			gpios = <&gpiomm 4 1>;
+			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "arv4520pw:blue:usb";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv4520pw:blue:wifi";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
 			label = "arv4520pw:red:internet";
-			gpios = <&gpiomm 9 1>;
+			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			info is missing