[source] lantiq: Sanitize device tree files

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 19 11:15:40 PDT 2016


mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/eba84bee4ce518dc509fe51f252c5307dccf3a1c

commit eba84bee4ce518dc509fe51f252c5307dccf3a1c
Author: Andreas Eberlein <foodeas at aeberlein.de>
AuthorDate: Thu Sep 29 18:22:55 2016 +0200

    lantiq: Sanitize device tree files
    
    The device tree file of ARV752DPW uses numbers/hex values for gpio states and input event codes.
    
    This cleans it up and uses the available macros from header files. This way the functions are easier to read and comprehend.
    
    Signed-off-by: Andreas Eberlein <foodeas at aeberlein.de>
    [sanitize all device tree files]
    Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 target/linux/lantiq/dts/ACMP252.dts        |  6 ++--
 target/linux/lantiq/dts/ARV4510PW.dts      | 46 ++++++++++++------------
 target/linux/lantiq/dts/ARV4518PWR01.dts   |  2 +-
 target/linux/lantiq/dts/ARV4518PWR01.dtsi  | 38 ++++++++++----------
 target/linux/lantiq/dts/ARV4518PWR01A.dts  |  2 +-
 target/linux/lantiq/dts/ARV4519PW.dts      | 44 +++++++++++------------
 target/linux/lantiq/dts/ARV4520PW.dts      | 46 ++++++++++++------------
 target/linux/lantiq/dts/ARV4525PW.dts      | 24 ++++++-------
 target/linux/lantiq/dts/ARV452CQW.dts      | 50 +++++++++++++-------------
 target/linux/lantiq/dts/ARV7506PW11.dts    | 30 ++++++++--------
 target/linux/lantiq/dts/ARV7510PW22.dts    | 30 ++++++++--------
 target/linux/lantiq/dts/ARV7518PW.dts      | 42 +++++++++++-----------
 target/linux/lantiq/dts/ARV7519PW.dts      | 44 +++++++++++------------
 target/linux/lantiq/dts/ARV7519RW22.dts    | 32 ++++++++---------
 target/linux/lantiq/dts/ARV7525PW.dts      | 24 ++++++-------
 target/linux/lantiq/dts/ARV752DPW.dts      | 48 ++++++++++++-------------
 target/linux/lantiq/dts/ARV752DPW22.dts    | 56 ++++++++++++++---------------
 target/linux/lantiq/dts/ARV8539PW22.dts    | 26 +++++++-------
 target/linux/lantiq/dts/BTHOMEHUBV2B.dts   | 40 ++++++++++-----------
 target/linux/lantiq/dts/BTHOMEHUBV3A.dts   | 38 ++++++++++----------
 target/linux/lantiq/dts/BTHOMEHUBV5A.dts   | 38 ++++++++++----------
 target/linux/lantiq/dts/DGN1000B.dts       | 24 ++++++-------
 target/linux/lantiq/dts/DGN3500.dts        |  2 +-
 target/linux/lantiq/dts/DGN3500.dtsi       | 34 +++++++++---------
 target/linux/lantiq/dts/DGN3500B.dts       |  2 +-
 target/linux/lantiq/dts/EASY50712.dts      |  4 +--
 target/linux/lantiq/dts/EASY50810.dts      |  4 +--
 target/linux/lantiq/dts/EASY80920.dtsi     | 32 ++++++++---------
 target/linux/lantiq/dts/EASY80920NAND.dts  |  2 +-
 target/linux/lantiq/dts/EASY80920NOR.dts   |  2 +-
 target/linux/lantiq/dts/FRITZ3370.dts      | 32 ++++++++---------
 target/linux/lantiq/dts/FRITZ7320.dts      | 24 ++++++-------
 target/linux/lantiq/dts/FRITZ7360SL.dts    | 26 +++++++-------
 target/linux/lantiq/dts/GIGASX76X.dts      | 14 ++++----
 target/linux/lantiq/dts/H201L.dts          | 36 +++++++++----------
 target/linux/lantiq/dts/P2601HNFX.dts      | 36 +++++++++----------
 target/linux/lantiq/dts/P2812HNUF1.dts     |  6 ++--
 target/linux/lantiq/dts/P2812HNUF3.dts     |  2 +-
 target/linux/lantiq/dts/P2812HNUFX.dtsi    | 40 ++++++++++-----------
 target/linux/lantiq/dts/TDW8970.dts        |  2 +-
 target/linux/lantiq/dts/TDW8980.dts        |  6 ++--
 target/linux/lantiq/dts/TDW89X0.dtsi       | 32 ++++++++---------
 target/linux/lantiq/dts/VG3503J.dts        | 12 +++----
 target/linux/lantiq/dts/VGV7510KW22.dtsi   | 32 ++++++++---------
 target/linux/lantiq/dts/VGV7510KW22BRN.dts |  2 +-
 target/linux/lantiq/dts/VGV7510KW22NOR.dts |  2 +-
 target/linux/lantiq/dts/VGV7519.dtsi       | 52 +++++++++++++--------------
 target/linux/lantiq/dts/VGV7519BRN.dts     |  2 +-
 target/linux/lantiq/dts/VGV7519NOR.dts     |  2 +-
 target/linux/lantiq/dts/VR200v.dts         | 42 +++++++++++-----------
 target/linux/lantiq/dts/WBMR.dts           | 38 ++++++++++----------
 target/linux/lantiq/dts/WBMR300.dts        | 58 +++++++++++++++---------------
 target/linux/lantiq/dts/amazonse.dtsi      |  3 ++
 target/linux/lantiq/dts/ar9.dtsi           |  3 ++
 target/linux/lantiq/dts/danube.dtsi        |  3 ++
 target/linux/lantiq/dts/vr9.dtsi           |  5 ++-
 56 files changed, 668 insertions(+), 656 deletions(-)

diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts
index 06b21b6..3961bf4 100644
--- a/target/linux/lantiq/dts/ACMP252.dts
+++ b/target/linux/lantiq/dts/ACMP252.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ACMP252 - AudioCodes MediaPack MP-252";
@@ -16,7 +16,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -87,7 +87,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 3 0>;
+			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		etop at E180000 {
diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts
index dca7a35..68aae2b 100644
--- a/target/linux/lantiq/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/dts/ARV4510PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV4510PW - Wippies, Elisa";
@@ -131,7 +131,7 @@
 				0x7800 0 0 2 &icu0 66
 				0x7800 0 0 3 &icu0 66
 			>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x7>;
 		};
 
@@ -145,13 +145,13 @@
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 14 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 3 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -159,72 +159,72 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "power";
-			gpios = <&gpios 21 0>;
+			gpios = <&gpios 21 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		power2: power2 {
 			label = "power2";
-			gpios = <&gpios 20 0>;
+			gpios = <&gpios 20 GPIO_ACTIVE_HIGH>;
 		};
 		lan1 {
 			label = "lan1";
-			gpios = <&gpios 19 0>;
+			gpios = <&gpios 19 GPIO_ACTIVE_HIGH>;
 		};
 		lan2 {
 			label = "lan2";
-			gpios = <&gpios 18 0>;
+			gpios = <&gpios 18 GPIO_ACTIVE_HIGH>;
 		};
 		lan3 {
 			label = "lan3";
-			gpios = <&gpios 17 0>;
+			gpios = <&gpios 17 GPIO_ACTIVE_HIGH>;
 		};
 		lan4 {
 			label = "lan4";
-			gpios = <&gpios 16 0>;
+			gpios = <&gpios 16 GPIO_ACTIVE_HIGH>;
 		};
 		wifi: wifi {
 			label = "wifi";
-			gpios = <&gpios 15 0>;
+			gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
 		};
 		adsl: adsl {
 			label = "adsl";
-			gpios = <&gpios 14 0>;
+			gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
 		};
 		internet: internet {
 			label = "internet";
-			gpios = <&gpios 13 0>;
+			gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
 		};
 		internet2 {
 			label = "internet2";
-			gpios = <&gpios 12 0>;
+			gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
 		};
 		voip {
 			label = "voip";
-			gpios = <&gpios 11 0>;
+			gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
 		};
 		phone {
 			label = "phone";
-			gpios = <&gpios 10 0>;
+			gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
 		};
 		phone2 {
 			label = "phone2";
-			gpios = <&gpios 9 0>;
+			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
 		usb: usb {
 			label = "usb";
-			gpios = <&gpios 8 0>;
+			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
 		usb2: usb2 {
 			label = "usb2";
-			gpios = <&gpios 7 0>;
+			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
 		usb3 {
 			label = "usb3";
-			gpios = <&gpios 6 0>;
+			gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
 		};
 		unlabeled {
 			label = "unlabeled";
-			gpios = <&gpios 5 0>;
+			gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dts b/target/linux/lantiq/dts/ARV4518PWR01.dts
index 7dfdb6f..3642cbe 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ARV4518PWR01.dtsi"
+#include "ARV4518PWR01.dtsi"
 
 / {
 	model = "ARV4518PWR01 - SMC7908A-ISP";
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index 3b29481..3173144 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -1,4 +1,4 @@
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	chosen {
@@ -23,7 +23,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -117,12 +117,12 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 14 0>;
+			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0xf>;
 		};
 
@@ -136,13 +136,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 28 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -150,48 +150,48 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "power";
-			gpios = <&gpio 3 0>;
+			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		dsl: dsl {
 			label = "dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
 			label = "online";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "wifi";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		dsl2 {
 			label = "dsl2";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "usb";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "voice";
-			gpios = <&gpiomm 0 1>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "fxs1";
-			gpios = <&gpiomm 1 1>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "fxs2";
-			gpios = <&gpiomm 2 1>;
+			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "fxo";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV4518PWR01A.dts b/target/linux/lantiq/dts/ARV4518PWR01A.dts
index 39ef71b..6c5047c 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01A.dts
+++ b/target/linux/lantiq/dts/ARV4518PWR01A.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ARV4518PWR01.dtsi"
+#include "ARV4518PWR01.dtsi"
 
 / {
 	model = "ARV4518PWR01A - SMC7908A-ISP, Airties WAV-221";
diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts
index 932bc4a..43334f1 100644
--- a/target/linux/lantiq/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/dts/ARV4519PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G";
@@ -27,7 +27,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -99,13 +99,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 14 0>;
+			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0xf>;
 		};
 	};
@@ -118,13 +118,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 28 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -133,60 +133,60 @@
 
 		power_green: power {
 			label = "arv4519pw:green:power";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "arv4519pw:red:power";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv4519pw:green:wlan";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "arv4519pw:green:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: online {
 			label = "arv4519pw:green:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
 			label = "arv4519pw:red:internet";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "arv4519pw:green:usb";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voip {
 			label = "arv4519pw:green:voip";
-			gpios = <&gpiomm 0 1>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "arv4519pw:green:phone1";
-			gpios = <&gpiomm 1 1>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv4519pw:green:phone2";
-			gpios = <&gpiomm 2 1>;
+			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "arv4519pw:green:line";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
 			label = "arv4519pw:green:wps";
-			gpios = <&gpiomm 4 1>;
+			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "arv4519pw:orange:wps";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
 			label = "arv4519pw:red:wps";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 8edca24..231ae15 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV4520PW - Easybox 800, WAV-281";
@@ -27,8 +27,8 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0
-				&gpiomm 7 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+				&gpiomm 7 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -118,13 +118,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-                        gpios = <&gpio 28 0>;
+                        gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 	};
@@ -139,13 +139,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>;
 		};
 	};
 
@@ -154,63 +154,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
diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts
index 0f264ff..3813b07 100644
--- a/target/linux/lantiq/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/dts/ARV4525PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV4525PW - Speedport W501V Typ A";
@@ -22,7 +22,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -109,7 +109,7 @@
 
 		pci at E105400 {
 			status = "okay";
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 	};
@@ -127,13 +127,13 @@
 
 		wps {
 			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>;
 		};
 	};
 
@@ -141,23 +141,23 @@
 		compatible = "gpio-leds";
 		fxo {
 			label = "arv4525pw:green:festnetz";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs {
 			label = "arv4525pw:green:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "arv4525pw:green:t-dsl";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv4525pw:green:wlan";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
 			label = "arv4525pw:green:online";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index ecfd6fd..eb9b45a 100644
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV452CQW - Arcor 801";
@@ -26,8 +26,8 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0
-				&gpiomm 7 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+				&gpiomm 7 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -122,7 +122,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 28 0>;
+			gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
 		};
 
 		etop at E180000 {
@@ -133,7 +133,7 @@
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 	};
@@ -149,18 +149,18 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 11 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 29 1>;
-			linux,code = <0x101>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_1>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -168,44 +168,44 @@
 		compatible = "gpio-leds";
 		power_blue: power0 {
 			label = "arv452cqw:blue:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl_blue: dsl {
 			label = "arv452cqw:blue:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
 			label = "arv452cqw:blue:isdn";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power1 {
 			label = "arv452cqw:red:power";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "arv452cqw:blue:wps";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps1 {
 			label = "arv452cqw:yellow:wps";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "arv452cqw:blue:telefon1";
-			gpios = <&gpiomm 0 1>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv452cqw:blue:telefon2";
-			gpios = <&gpiomm 1 1>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
 			label = "arv452cqw:red:wps";
-			gpios = <&gpiomm 2 1>;
+			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "arv452cqw:blue:line";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "arv452cqw:blue:sprache";
@@ -213,11 +213,11 @@
 		};
 		usb: usb {
 			label = "arv452cqw:blue:usb";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv452cqw:blue:wlan";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			internet blue and internet red are missing
@@ -225,11 +225,11 @@
 		*/
 		dsl2 {
 			label = "arv452cqw:yellow:dsl";
-			gpios = <&gpiomm 8 1>;
+			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		dsl3 {
 			label = "arv452cqw:red:dsl";
-			gpios = <&gpiomm 9 1>;
+			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7506PW11.dts b/target/linux/lantiq/dts/ARV7506PW11.dts
index 215d442..352972b 100644
--- a/target/linux/lantiq/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/dts/ARV7506PW11.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV7506PW11 - Alice/O2 IAD 4421";
@@ -83,7 +83,7 @@
 
 		pci at E105400 {
 			status = "okay";
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -100,13 +100,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 11 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -114,40 +114,40 @@
 		compatible = "gpio-leds";
 		wlan: wlan {
 			label = "arv7506pw11:green:wlan";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		power: power {
 			label = "arv7506pw11:green:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
 			label = "arv7506pw11:green:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
 			label = "arv7506pw11:green:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power_red {
 			label = "arv7506pw11:red:power";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
 			label = "arv7506pw11:red:internet";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		info {
 			label = "arv7506pw11:green:info";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		telefon {
 			label = "arv7506pw11:green:telefon";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
 			label = "arv7506pw11:red:info";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts
index 90a55fe..f288511 100644
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV7510PW22 - Astoria Networks";
@@ -26,7 +26,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 9 0>;
+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -113,7 +113,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 8 0>;
+			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		etop at E180000 {
@@ -131,7 +131,7 @@
 				0x7800 0 0 2 &icu0 135
 				0x7800 0 0 3 &icu0 135
 			>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x3>;
 		};
 	};
@@ -149,18 +149,18 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 11 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		restart {
 			label = "restart";
-			gpios = <&gpio 12 1>;
-			linux,code = <0x100>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_0>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 28 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -168,24 +168,24 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "power";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		internet: internet {
 			label = "internet";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
 			label = "wlan";
-			gpios = <&gpio 10 1>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		umts: 3g {
 			label = "3g";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		message {
 			label = "message";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts
index 8a880fe..e5e5e70 100644
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV7518PW - Astoria Networks";
@@ -135,13 +135,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 14 0>;
+			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0xf>;
 		};
 
@@ -158,13 +158,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 28 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -172,60 +172,60 @@
 		compatible = "gpio-leds";
 		power_green: power {
 			label = "arv7518pw:green:power";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
 			label = "arv7518pw:green:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
 			label = "arv7518pw:green:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv7518pw:green:wlan";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
 			label = "arv7518pw:red:power";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
 			label = "arv7518pw:red:internet";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "arv7518pw:green:usb";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "arv7518pw:green:voip";
-			gpios = <&gpiomm 0 1>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "arv7518pw:green:phone1";
-			gpios = <&gpiomm 1 1>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv7518pw:green:phone2";
-			gpios = <&gpiomm 2 1>;
+			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		unlabeled {
 			label = "arv7518pw:amber:unlabeled";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "arv7518pw:amber:wps";
-			gpios = <&gpiomm 4 1>;
+			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
 			label = "arv7518pw:green:wps";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
 			label = "arv7518pw:red:wps";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts
index 57c1bde..4639ce7 100644
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV7519PW - Astoria Networks";
@@ -117,7 +117,7 @@
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0xf>;
 		};
 	};
@@ -135,13 +135,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 11 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 28 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -149,64 +149,64 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "power";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power2: power2 {
 			label = "power2";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
 			label = "online";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
 			label = "online2";
-			gpios = <&gpio 30 1>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "wifi";
-			gpios = <&gpio 12 1>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
 			label = "wifi2";
-			gpios = <&gpio 10 1>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		wifi3 {
 			label = "wifi3";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "voice";
-			gpios = <&gpio 31 1>;
+			gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
 			label = "wps2";
-			gpios = <&gpio 7 1>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
 			label = "wps3";
-			gpios = <&gpio 23 1>;
+			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		lan {
 			label = "lan";
-			gpios = <&gpio 1 1>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 		tv {
 			label = "tv";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		upgrade {
 			label = "upgrade";
-			gpios = <&gpio 29 1>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -218,7 +218,7 @@
 		switch {
 			gpio-export,name = "switch";
 			gpio-export,output = <1>;
-			gpios = <&gpio 19 0>;
+			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index f1d5f63..5d78448 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "ARV7519RW22 - Orange Livebox 2.1";
@@ -80,12 +80,12 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 32 0>;
+			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 32 0>;
+			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
 		};
 
 		pcie at d900000 {
@@ -113,18 +113,18 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 6 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 33 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 37 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -133,32 +133,32 @@
 
 		lan_green {
 			label = "arv7519rw22:green:lan";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
 			label = "arv7519rw22:red:internet";
-			gpios = <&gpio 10 1>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power_green {
 			label = "arv7519rw22:green:power";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		alarm_blue {
 			label = "arv7519rw22:blue:alarm";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		internet_orange {
 			label = "arv7519rw22:orange:internet";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
 			label = "arv7519rw22:green:internet";
-			gpios = <&gpio 28 1>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 		voice_green {
 			label = "arv7519rw22:green:voice";
-			gpios = <&gpio 29 1>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts
index e889362..8e36733 100644
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV7525PW - Speedport W303V Typ A";
@@ -26,7 +26,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -113,13 +113,13 @@
 
 		wps {
 			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>;
 		};
 	};
 
@@ -127,28 +127,28 @@
 		compatible = "gpio-leds";
 		power_green: power {
 			label = "arv7525pw:green:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power1 {
 			label = "arv7525pw:red:power";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
 			label = "arv7525pw:green:online";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "arv7525pw:green:telefonie";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
 			label = "arv7525pw:red:telefonie";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv7525pw:green:wlan";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index a350daf..b800055 100644
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV752DPW - Arcor 802";
@@ -26,7 +26,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpiomm 1 0>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -128,7 +128,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpiomm 0 0>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		etop at E180000 {
@@ -139,7 +139,7 @@
 		pci at E105400 {
 			status = "okay";
 			lantiq,external-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			interrupt-map = <0x7000 0 0 1 &icu0 135>;
 			req-mask = <0x3>;
 		};
@@ -159,23 +159,23 @@
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 11 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		restart {
 			label = "restart";
-			gpios = <&gpio 12 1>;
-			linux,code = <0x100>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_0>;
 		};
 		dsl {
 			label = "dsl";
-			gpios = <&gpio 13 1>;
-			linux,code = <0x101>;
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_1>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 30 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -183,52 +183,52 @@
 		compatible = "gpio-leds";
 		power_blue: power1 {
 			label = "arv752dpw:blue:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
 			label = "arv752dpw:red:internet";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
 			label = "arv752dpw:red:message";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
 			label = "arv752dpw:red:power";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
 			label = "arv752dpw:red:voice";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
 			label = "arv752dpw:red:umts";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv752dpw:red:wifi";
-			gpios = <&gpiomm 4 1>;
+			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "arv752dpw:green:tae-n";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv752dpw:green:tae-u";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "arv752dpw:green:isdn";
-			gpios = <&gpiomm 7 1>;
+			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
 			label = "arv752dpw:blue:internet";
-			gpios = <&gpiomm 8 1>;
+			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
 			label = "arv752dpw:blue:voice";
-			gpios = <&gpiomm 9 1>;
+			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index db6656b..9977ec1 100644
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV752DPW22 - Arcor 803";
@@ -26,7 +26,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpiomm 1 0>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -127,7 +127,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpiomm 0 0>;
+			gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		etop at E180000 {
@@ -144,7 +144,7 @@
 			        0x7800 0 0 2 &icu0 135
 			        0x7800 0 0 3 &icu0 135
 			>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x3>;
 		};
 
@@ -163,23 +163,23 @@
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 11 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		restart {
 			label = "restart";
-			gpios = <&gpio 12 1>;
-			linux,code = <0x110>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_LEFT>;
 		};
 		dsl {
 			label = "dsl";
-			gpios = <&gpio 13 1>;
-			linux,code = <0x111>;
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_RIGHT>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 28 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -187,68 +187,68 @@
 		compatible = "gpio-leds";
 		power_blue: power1 {
 			label = "arv752dpw22:blue:power";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
 			label = "arv752dpw22:red:internet";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
 			label = "arv752dpw22:red:message";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
 			label = "arv752dpw22:red:power";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
 			label = "arv752dpw22:red:voice";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
 			label = "arv752dpw22:red:umts";
-			gpios = <&gpiomm 3 1>;
+			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "arv752dpw22:red:wifi";
-			gpios = <&gpiomm 4 1>;
+			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
 			label = "arv752dpw22:green:tae-n";
-			gpios = <&gpiomm 5 1>;
+			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
 			label = "arv752dpw22:green:tae-u";
-			gpios = <&gpiomm 6 1>;
+			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
 			label = "arv752dpw22:green:isdn";
-			gpios = <&gpiomm 7 1>;
+			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
 			label = "arv752dpw22:blue:internet";
-			gpios = <&gpiomm 8 1>;
+			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
 			label = "arv752dpw22:blue:voice";
-			gpios = <&gpiomm 9 1>;
+			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		eth1 {
 			 label = "arv752dpw22:green:lan1";
-			 gpios = <&gpiomm 11 1>;
+			 gpios = <&gpiomm 11 GPIO_ACTIVE_LOW>;
 		};
 		eth2 {
 			label = "arv752dpw22:green:lan2";
-			gpios = <&gpiomm 12 1>;
+			gpios = <&gpiomm 12 GPIO_ACTIVE_LOW>;
 		};
 		eth3 {
 			label = "arv752dpw22:green:lan3";
-			gpios = <&gpiomm 13 1>;
+			gpios = <&gpiomm 13 GPIO_ACTIVE_LOW>;
 		};
 		eth4 {
 			label = "arv752dpw22:green:lan4";
-			gpios = <&gpiomm 14 1>;
+			gpios = <&gpiomm 14 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts
index 9199fad..a03b745 100644
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "ARV8539PW22 - Speedport W 504V Typ A";
@@ -22,7 +22,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -112,12 +112,12 @@
 
 		pci at E105400 {
 			status = "okay";
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 14 0>;
+			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
@@ -131,13 +131,13 @@
 
 		wlan {
 			label = "wlan";
-			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>;
 		};
 	};
 
@@ -146,27 +146,27 @@
 
 		power_green: power-green {
 			label = "arv8539pw22:green:power";
-			gpios = <&gpio 24 1>;
+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power-red {
 			label = "arv8539pw22:red:power";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl_green: dsl-green {
 			label = "arv8539pw22:green:dsl";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		online_green: online-green {
 			label = "arv8539pw22:green:online";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless_green: wireless-green {
 			label = "arv8539pw22:green:wlan";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			telefonie green is missing
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 2287580..7a0edae 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "BTHOMEHUBV2B - BT Home Hub 2B";  /* SoC: Lantiq Danube-S PSB 50712 @ 333MHz V1.3/1.5 */
@@ -25,7 +25,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -214,7 +214,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;		 /* GNT1 */
 		};
 
@@ -228,18 +228,18 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 2 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		findhandset {
 			label = "findhandset";
-			gpios = <&gpio 15 1>;
-			linux,code = <0x101>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_1>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 22 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -248,52 +248,52 @@
 
 		upgrading-orange {
 			label = "bthomehubv2b:orange:upgrading";
-			gpios = <&stp0 5 0>;
+			gpios = <&stp0 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		phone-orange {
 			label = "bthomehubv2b:orange:phone";
-			gpios = <&stp0 6 0>;
+			gpios = <&stp0 6 GPIO_ACTIVE_HIGH>;
 		};
 		phone-blue {
 			label = "bthomehubv2b:blue:phone";
-			gpios = <&stp0 7 0>;
+			gpios = <&stp0 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless-orange {
 			label = "bthomehubv2b:orange:wireless";
-			gpios = <&stp0 8 0>;
+			gpios = <&stp0 8 GPIO_ACTIVE_HIGH>;
 		};
 		wireless_blue: wireless-blue {
 			label = "bthomehubv2b:blue:wireless";
-			gpios = <&stp0 9 0>;
+			gpios = <&stp0 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		broadband-red {
 			label = "bthomehubv2b:red:broadband";
-			gpios = <&stp0 10 0>;
+			gpios = <&stp0 10 GPIO_ACTIVE_HIGH>;
 		};
 		broadband-orange {
 			label = "bthomehubv2b:orange:broadband";
-			gpios = <&stp0 11 0>;
+			gpios = <&stp0 11 GPIO_ACTIVE_HIGH>;
 		};
 		broadband_blue: broadband-blue {
 			label = "bthomehubv2b:blue:broadband";
-			gpios = <&stp0 12 0>;
+			gpios = <&stp0 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power-red {
 			label = "bthomehubv2b:red:power";
-			gpios = <&stp0 13 0>;
+			gpios = <&stp0 13 GPIO_ACTIVE_HIGH>;
 		};
 		power_orange: power-orange {
 			label = "bthomehubv2b:orange:power";
-			gpios = <&stp0 14 0>;
+			gpios = <&stp0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
 			label = "bthomehubv2b:blue:power";
-			gpios = <&stp0 15 0>;
+			gpios = <&stp0 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index 7879997..996d5b2 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	model = "BTHOMEHUBV3A - BT Home Hub 3A";  /* SoC: Lantiq ar9 @ 333MHz */
@@ -25,7 +25,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpio 31 0>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -143,12 +143,12 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 	};
@@ -160,18 +160,18 @@
 		poll-interval = <100>;
 		reset {
 			label = "reset";
-			gpios = <&gpio 54 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 54 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		restart {
 			label = "restart";
-			gpios = <&gpio 52 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 53 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -180,42 +180,42 @@
 
 		wireless-red {
 			label = "bthomehubv3a:red:wireless";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		wireless-orange {
 			label = "bthomehubv3a:orange:wireless";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
 			label = "bthomehubv3a:blue:wireless";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		broadband-red {
 			label = "bthomehubv3a:red:broadband";
-			gpios = <&gpio 11 1>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		broadband-orange {
 			label = "bthomehubv3a:orange:broadband";
-			gpios = <&gpio 0 1>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
 			label = "bthomehubv3a:blue:broadband";
-			gpios = <&gpio 12 1>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power-red {
 			label = "bthomehubv3a:red:power";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		power_orange: power-orange {
 			label = "bthomehubv3a:orange:power";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
 			label = "bthomehubv3a:blue:power";
-			gpios = <&gpio 1 1>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index fa00f70..97d0829 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "BTHOMEHUBV5A - BT Home Hub 5A";
@@ -114,7 +114,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
@@ -122,7 +122,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -149,20 +149,20 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 2 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 25 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 
 		restart {
 			label = "restart";
-			gpios = <&gpio 39 1>;
-			linux,code = <0x74>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_POWER>;
 		};
 	};
 
@@ -172,49 +172,49 @@
 		/* broadband-* is a single RGB led */
 		broadband-red {
 			label = "bthomehubv5a:red:broadband";
-			gpios = <&gpio 0 1>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband-green {
 			label = "bthomehubv5a:green:broadband";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
 			label = "bthomehubv5a:blue:broadband";
-			gpios = <&gpio 8 1>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		/* wireless-* is a single RGB led */
 		wireless-red {
 			label = "bthomehubv5a:red:wireless";
-			gpios = <&gpio 9 1>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		wireless-green {
 			label = "bthomehubv5a:green:wireless";
-			gpios = <&gpio 10 1>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
 			label = "bthomehubv5a:blue:wireless";
-			gpios = <&gpio 11 1>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		/* power-* is a single RGB led */
 		power_red: power-red {
 			label = "bthomehubv5a:red:power";
-			gpios = <&gpio 12 1>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power-green {
 			label = "bthomehubv5a:green:power";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
 			label = "bthomehubv5a:blue:power";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		dimmed {
 			label = "dimmed";
-			gpios = <&gpio 19 0>;
+			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts
index b84eab0..fdcce1b 100644
--- a/target/linux/lantiq/dts/DGN1000B.dts
+++ b/target/linux/lantiq/dts/DGN1000B.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "amazonse.dtsi"
+#include "amazonse.dtsi"
 
 / {
 	model = "DGN1000B - Netgear DGN1000B";
@@ -117,18 +117,18 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 0 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 25 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 29 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -136,27 +136,27 @@
 		compatible = "gpio-leds";
 		dsl: dsl {
 			label = "dgn1000b:green:dsl";
-			gpios = <&gpio 1 1>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online_green: online {
 			label = "dgn1000b:green:online";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online2 {
 			label = "dgn1000b:red:online";
-			gpios = <&gpio 3 1>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		wps {
 			label = "dgn1000b:green:wps";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		power: power {
 			label = "dgn1000b:green:power";
-			gpios = <&gpio 13 1>;
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		/*
diff --git a/target/linux/lantiq/dts/DGN3500.dts b/target/linux/lantiq/dts/DGN3500.dts
index d256871..9017a42 100644
--- a/target/linux/lantiq/dts/DGN3500.dts
+++ b/target/linux/lantiq/dts/DGN3500.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "DGN3500.dtsi"
+#include "DGN3500.dtsi"
 
 / {
 	model = "DGN3500 - Netgear DGN3500";
diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index f86ccc5..983d854 100644
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -1,4 +1,4 @@
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	chosen {
@@ -75,7 +75,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>; /* GNT1 */
 		};
 	};
@@ -90,8 +90,8 @@
 
 	rtl8366rb {
 		compatible = "rtl8366rb";
-		gpio-sda = <&gpio 35 0>;
-		gpio-sck = <&gpio 37 0>;
+		gpio-sda = <&gpio 35 GPIO_ACTIVE_HIGH>;
+		gpio-sck = <&gpio 37 GPIO_ACTIVE_HIGH>;
 	};
 
 	gpio-keys-polled {
@@ -102,18 +102,18 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 36 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 54 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 54 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio 53 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -121,38 +121,38 @@
 		compatible = "gpio-leds";
 		internet: internet {
 			label = "dgn3500:green:internet";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			internet red is missing
 		*/
 		dsl: dsl {
 			label = "dgn3500:green:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "dgn3500:green:usb";
-			gpios = <&gpio 22 1>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
 			label = "dgn3500:green:power";
-			gpios = <&gpio 34 1>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "dgn3500:red:power";
-			gpios = <&gpio 39 1>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
         /*
 			power amber is missing
 		*/
 		wifi: wifi {
 			label = "dgn3500:blue:wireless";
-			gpios = <&gpio 51 1>;
+			gpios = <&gpio 51 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "dgn3500:green:wps";
-			gpios = <&gpio 52 1>;
+			gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/DGN3500B.dts b/target/linux/lantiq/dts/DGN3500B.dts
index 71a4e58..d0ed5eb 100644
--- a/target/linux/lantiq/dts/DGN3500B.dts
+++ b/target/linux/lantiq/dts/DGN3500B.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "DGN3500.dtsi"
+#include "DGN3500.dtsi"
 
 / {
 	model = "DGN3500B - Netgear DGN3500B";
diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts
index 39ba1f7..a751375 100644
--- a/target/linux/lantiq/dts/EASY50712.dts
+++ b/target/linux/lantiq/dts/EASY50712.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	chosen {
@@ -111,7 +111,7 @@
 			interrupt-map = <
                                 0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
 			>;
-			gpios-reset = <&gpio 21 0>;
+			gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;		/* GNT1 */
 		};
 
diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts
index 70d2ff5..f04796c 100644
--- a/target/linux/lantiq/dts/EASY50810.dts
+++ b/target/linux/lantiq/dts/EASY50810.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	chosen {
@@ -112,7 +112,7 @@
 			interrupt-map = <
                                 0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
 			>;
-			gpios-reset = <&gpio 21 0>;
+			gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;		/* GNT1 */
 		};
 
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 57dc457..c643bf1 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -1,4 +1,4 @@
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	chosen {
@@ -116,7 +116,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
@@ -138,7 +138,7 @@
 			interrupt-map = <
 				0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
 				>;
-			gpios-reset = <&gpio 21 0>;
+			gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;	/* GNT1 */
 		};
 	};
@@ -157,13 +157,13 @@
 		poll-interval = <100>;
 /*		reset {
 			label = "reset";
-			gpios = <&gpio 7 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};*/
 		paging {
 			label = "paging";
-			gpios = <&gpio 11 1>;
-			linux,code = <0x100>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_0>;
 		};
 	};
 
@@ -172,40 +172,40 @@
 
 		power: power {
 			label = "easy80920:green:power";
-			gpios = <&stp 9 0>;
+			gpios = <&stp 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		warning {
 			label = "easy80920:green:warning";
-			gpios = <&stp 22 0>;
+			gpios = <&stp 22 GPIO_ACTIVE_HIGH>;
 		};
 		fxs1 {
 			label = "easy80920:green:fxs1";
-			gpios = <&stp 21 0>;
+			gpios = <&stp 21 GPIO_ACTIVE_HIGH>;
 		};
 		fxs2 {
 			label = "easy80920:green:fxs2";
-			gpios = <&stp 20 0>;
+			gpios = <&stp 20 GPIO_ACTIVE_HIGH>;
 		};
 		fxo {
 			label = "easy80920:green:fxo";
-			gpios = <&stp 19 0>;
+			gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
 		};
 		usb1: usb1 {
 			label = "easy80920:green:usb1";
-			gpios = <&stp 18 0>;
+			gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
 		};
 		usb2: usb2 {
 			label = "easy80920:green:usb2";
-			gpios = <&stp 15 0>;
+			gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
 		};
 		sd {
 			label = "easy80920:green:sd";
-			gpios = <&stp 14 0>;
+			gpios = <&stp 14 GPIO_ACTIVE_HIGH>;
 		};
 		wps {
 			label = "easy80920:green:wps";
-			gpios = <&stp 12 0>;
+			gpios = <&stp 12 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/EASY80920NAND.dts b/target/linux/lantiq/dts/EASY80920NAND.dts
index 96d5f64..332f2fb 100644
--- a/target/linux/lantiq/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/dts/EASY80920NAND.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 
-/include/ "EASY80920.dtsi"
+#include "EASY80920.dtsi"
 
 / {
 	model = "EASY80920NAND - Intel EASY80920 Nand";
diff --git a/target/linux/lantiq/dts/EASY80920NOR.dts b/target/linux/lantiq/dts/EASY80920NOR.dts
index 39367f7..6ad17d6 100644
--- a/target/linux/lantiq/dts/EASY80920NOR.dts
+++ b/target/linux/lantiq/dts/EASY80920NOR.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 
-/include/ "EASY80920.dtsi"
+#include "EASY80920.dtsi"
 
 / {
 	model = "EASY80920NOR - Intel EASY80920 Nor";
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 35880f5..775fa5d 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "FRITZ3370 - Fritz!Box WLAN 3370";
@@ -110,8 +110,8 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 5 0
-				&gpio 14 0>;
+			gpios = <&gpio 5 GPIO_ACTIVE_HIGH
+				&gpio 14 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 	};
@@ -136,13 +136,13 @@
 		poll-interval = <100>;
 		power {
 			label = "power";
-			gpios = <&gpio 1 0>;
-			linux,code = <0x100>;
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_0>;
 		};
 /*		wifi {
 			label = "wifi";
-			gpios = <&gpio 29 0>;
-			linux,code = <0x101>;
+			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_1>;
 		};*/
 	};
 
@@ -151,32 +151,32 @@
 
 		power_green: power {
 			label = "fritz3370:green:power";
-			gpios = <&gpio 32 1>;
+			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "fritz3370:red:power";
-			gpios = <&gpio 33 1>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
 			label = "fritz3370:red:info";
-			gpios = <&gpio 34 1>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "fritz3370:green:wlan";
-			gpios = <&gpio 35 1>;
+			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "fritz3370:green:dsl";
-			gpios = <&gpio 36 1>;
+			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 		lan {
 			label = "fritz3370:green:lan";
-			gpios = <&gpio 38 1>;
+			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
 			label = "fritz3370:green:info";
-			gpios = <&gpio 47 1>;
+			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -228,14 +228,14 @@
 			reg = <0>;
 			phy-mode = "rgmii";
 			phy-handle = <&phy0>;
-			gpios = <&gpio 37 0>;
+			gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
 		};
 		ethernet at 1 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <1>;
 			phy-mode = "rgmii";
 			phy-handle = <&phy1>;
-			gpios = <&gpio 44 0>;
+			gpios = <&gpio 44 GPIO_ACTIVE_HIGH>;
 		};
 		ethernet at 2 {
 			compatible = "lantiq,xrx200-pdi-port";
diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index 643546c..9884038 100644
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	model = "FRITZ7320 - 1&1 HomeServer";
@@ -109,7 +109,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0xf>; /* GNT1 */
 		};
 	};
@@ -122,13 +122,13 @@
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 1 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		dect {
 			label = "dect";
-			gpios = <&gpio 2 1>;
-			linux,code = <0x102>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_2>;
 		};
 	};
 
@@ -136,28 +136,28 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "fritz7320:green:power";
-			gpios = <&gpio 44 1>;
+			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice {
 			label = "fritz7320:green:fon";
-			gpios = <&gpio 47 1>;
+			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		dect {
 			label = "fritz7320:green:dect";
-			gpios = <&gpio 38 1>;
+			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
 			label = "fritz7320:green:wlan";
-			gpios = <&gpio 37 1>;
+			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
 			label = "fritz7320:green:info";
-			gpios = <&gpio 35 1>;
+			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
 			label = "fritz7320:red:info";
-			gpios = <&gpio 45 1>;
+			gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts
index 02e9781..f41ea41 100644
--- a/target/linux/lantiq/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/dts/FRITZ7360SL.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "FRITZ7360SL - 1&1 HomeServer";
@@ -115,13 +115,13 @@
 		poll-interval = <100>;
 		dect {
 			label = "power";
-			gpios = <&gpio 1 0>;
-			linux,code = <0x102>;
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_2>;
 		};
 		wifi {
 			label = "wifi";
-			gpios = <&gpio 29 0>;
-			linux,code = <0x101>;
+			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_1>;
 		};
 	};
 
@@ -130,28 +130,28 @@
 
 		power_green: power {
 			label = "fritz7360sl:green:power";
-			gpios = <&gpio 32 1>;
+			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "fritz7360sl:red:power";
-			gpios = <&gpio 33 1>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
 			label = "fritz7360sl:red:info";
-			gpios = <&gpio 34 1>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
 			label = "fritz7360sl:green:info";
-			gpios = <&gpio 47 1>;
+			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "fritz7360sl:green:wlan";
-			gpios = <&gpio 36 1>;
+			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 		dect {
 			label = "fritz7360sl:green:dect";
-			gpios = <&gpio 35 1>;
+			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -170,14 +170,14 @@
 			reg = <0>;
 			phy-mode = "rmii";
 			phy-handle = <&phy0>;
-			// gpios = <&gpio 37 1>;
+			// gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		ethernet at 1 {
 			compatible = "lantiq,xrx200-pdi-port";
 			reg = <1>;
 			phy-mode = "rmii";
 			phy-handle = <&phy1>;
-			// gpios = <&gpio 44 1>;
+			// gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 		ethernet at 2 {
 			compatible = "lantiq,xrx200-pdi-port";
diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts
index a43e4d4..003083c 100644
--- a/target/linux/lantiq/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/dts/GIGASX76X.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "danube.dtsi"
+#include "danube.dtsi"
 
 / {
 	model = "GIGASX76X - Gigaset SX761,SX762,SX763";
@@ -16,7 +16,7 @@
 	sram at 1F000000 {
 		vmmc at 107000 {
 			status = "okay";
-			gpios = <&gpiomm 1 0>;
+			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -84,13 +84,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 29 0>;
+			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
 			status = "okay";
 			lantiq,internal-clock;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;
 		};
 	};
@@ -103,8 +103,8 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 14 0>;
-			linux,code = <0x198>;
+			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -115,7 +115,7 @@
 		switch {
 			gpio-export,name = "switch";
 			gpio-export,output = <1>;
-			gpios = <&gpio 19 0>;
+			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts
index c4208e3..8572359 100644
--- a/target/linux/lantiq/dts/H201L.dts
+++ b/target/linux/lantiq/dts/H201L.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	model = "H201L - ZTE H210L";
@@ -72,7 +72,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 36 0>;
+			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -84,18 +84,18 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 53 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 54 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 54 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 55 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 55 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 	};
 
@@ -104,32 +104,32 @@
 
 		power_green: power {
 			label = "h201l:green:power";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		online: online {
 			label = "h201l:green:internet";
-			gpios = <&gpio 37 1>;
+			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "h201l:green:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		phone {
 			label = "h201l:green:phone";
-			gpios = <&gpio 39 1>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 		wps {
 			label = "h201l:green:wps";
-			gpios = <&gpio 22 1>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "h201l:green:wlan";
-			gpios = <&gpio 6 1>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "h201l:green:usb";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -140,17 +140,17 @@
 		switch {
 			gpio-export,name = "switch";
 			gpio-export,output = <1>;
-			gpios = <&gpio 38 0>;
+			gpios = <&gpio 38 GPIO_ACTIVE_HIGH>;
 		};
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
-			gpios = <&gpio 28 0>;
+			gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
 		};
 		wifi {
 			gpio-export,name = "wifi";
 			gpio-export,output = <1>;
-			gpios = <&gpio 7 0>;
+			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts
index 5ab5ae7..3994c18 100644
--- a/target/linux/lantiq/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/dts/P2601HNFX.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	model = "P2601HNFX - ZyXEL P-2601HN-Fx";
@@ -108,7 +108,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 9 0>;
+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		stp: stp at E100BB0 {
@@ -125,7 +125,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 29 1>;
-			gpios-reset = <&gpio 21 0>;
+			gpios-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;
 		};
 	};
@@ -138,13 +138,13 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 53 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 54 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 54 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 	};
 
@@ -153,40 +153,40 @@
 
 		power_green: power {
 			label = "p2601hnfx:green:power";
-			gpios = <&stp 11 1>;
+			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "p2601hnfx:red:power";
-			gpios = <&gpio 29 1>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
 			label = "p2601hnfx:green:internet";
-			gpios = <&stp 13 1>;
+			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
 			label = "p2601hnfx:red:internet";
-			gpios = <&stp 12 1>;
+			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "p2601hnfx:green:dsl";
-			gpios = <&stp 14 1>;
+			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 		};
 		phone {
 			label = "p2601hnfx:green:phone";
-			gpios = <&stp 9 1>;
+			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
 			label = "p2601hnfx:orange:phone";
-			gpios = <&stp 8 1>;
+			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "p2601hnfx:green:wireless";
-			gpios = <&stp 15 1>;
+			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
 			label = "p2601hnfx:orange:wireless";
-			gpios = <&stp 10 1>;
+			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -197,12 +197,12 @@
 		switch {
 			gpio-export,name = "switch";
 			gpio-export,output = <1>;
-			gpios = <&gpio 50 0>;
+			gpios = <&gpio 50 GPIO_ACTIVE_HIGH>;
 		};
 		usb {
 			gpio-export,name = "wifi";
 			gpio-export,output = <1>;
-			gpios = <&gpio 9 0>;
+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index 87b2f8a..5829ee5 100644
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "P2812HNUFX.dtsi"
+#include "P2812HNUFX.dtsi"
 
 / {
 	model = "P2812HNUF1 - ZyXEL P-2812HNU-F1";
@@ -57,11 +57,11 @@
 	gpio-leds {
 		usb1: usb1 {
 			label = "p2812hnuf1:green:usb1";
-			gpios = <&gpio 38 1>;
+			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		usb2: usb2 {
 			label = "p2812hnuf1:green:usb2";
-			gpios = <&gpio 44 1>;
+			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/P2812HNUF3.dts b/target/linux/lantiq/dts/P2812HNUF3.dts
index dabf5ed..54795a3 100644
--- a/target/linux/lantiq/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/dts/P2812HNUF3.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "P2812HNUFX.dtsi"
+#include "P2812HNUFX.dtsi"
 
 / {
 	model = "P2812HNUF3 - ZyXEL P-2812HNU-F3";
diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
index 30eee50..e6f69bb 100644
--- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
@@ -1,4 +1,4 @@
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	chosen {
@@ -136,13 +136,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
@@ -164,7 +164,7 @@
 			interrupt-map = <
 				0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
 				>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;	/* GNT1 */
 		};
 	};
@@ -184,14 +184,14 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 39 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 1 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 	};
 
@@ -200,52 +200,52 @@
 
 		internet_red {
 			label = "p2812hnufx:red:internet";
-			gpios = <&stp 16 1>;
+			gpios = <&stp 16 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
 			label = "p2812hnufx:green:internet";
-			gpios = <&stp 17 1>;
+			gpios = <&stp 17 GPIO_ACTIVE_LOW>;
 		};
 		dsl_green: dsl_green {
 			label = "p2812hnufx:green:dsl";
-			gpios = <&stp 18 1>;
+			gpios = <&stp 18 GPIO_ACTIVE_LOW>;
 		};
 		dsl_orange {
 			label = "p2812hnufx:orange:dsl";
-			gpios = <&stp 19 1>;
+			gpios = <&stp 19 GPIO_ACTIVE_LOW>;
 		};
 		wireless_orange {
 			label = "p2812hnufx:orange:wlan";
-			gpios = <&stp 20 1>;
+			gpios = <&stp 20 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
 			label = "p2812hnufx:green:wlan";
-			gpios = <&stp 21 1>;
+			gpios = <&stp 21 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
 			label = "p2812hnufx:red:power";
-			gpios = <&stp 22 1>;
+			gpios = <&stp 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
 			label = "p2812hnufx:green:power";
-			gpios = <&stp 23 1>;
+			gpios = <&stp 23 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		phone1 {
 			label = "p2812hnufx:green:phone";
-			gpios = <&gpio 11 1>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		phone1warn {
 			label = "p2812hnufx:orange:phone";
-			gpios = <&gpio 12 1>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		phone2warn {
 			label = "p2812hnufx:orange:phone2";
-			gpios = <&gpio 26 1>;
+			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
 			label = "p2812hnufx:green:phone2";
-			gpios = <&gpio 28 1>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/TDW8970.dts b/target/linux/lantiq/dts/TDW8970.dts
index 172c46c..6a376a0 100644
--- a/target/linux/lantiq/dts/TDW8970.dts
+++ b/target/linux/lantiq/dts/TDW8970.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "TDW89X0.dtsi"
+#include "TDW89X0.dtsi"
 
 / {
 	model = "TDW8970 - TP-LINK TD-W8970";
diff --git a/target/linux/lantiq/dts/TDW8980.dts b/target/linux/lantiq/dts/TDW8980.dts
index 8a07a5c..95eec58 100644
--- a/target/linux/lantiq/dts/TDW8980.dts
+++ b/target/linux/lantiq/dts/TDW8980.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "TDW89X0.dtsi"
+#include "TDW89X0.dtsi"
 
 / {
 	model = "TDW8980 - TP-LINK TD-W8980";
@@ -21,7 +21,7 @@
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -32,7 +32,7 @@
 	gpio-leds {
 		wifi2 {
 			label = "tdw8980:green:wlan5ghz";
-			gpios = <&gpio 24 1>;
+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index d6a89fe..1471bd7 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -1,4 +1,4 @@
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	chosen {
@@ -69,13 +69,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -102,21 +102,21 @@
 		poll-interval = <100>;
 		reset {
 			label = "reset";
-			gpios = <&gpio 0 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wifi {
 			label = "wifi";
-			gpios = <&gpio 9 0>;
-			linux,code = <0xf7>;
-			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_RFKILL>;
+			linux,input-type = <EV_SW>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 39 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -127,23 +127,23 @@
         */
 		dsl: dsl {
 			label = "tdw89x0:green:dsl";
-			gpios = <&gpio 4 0>;
+			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 		internet: internet {
 			label = "tdw89x0:green:internet";
-			gpios = <&gpio 5 0>;
+			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 		usb0: usb0 {
 			label = "tdw89x0:green:usb";
-			gpios = <&gpio 19 0>;
+			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 		usb2: usb2 {
 			label = "tdw89x0:green:usb2";
-			gpios = <&gpio 20 0>;
+			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
 		wps: wps {
 			label = "tdw89x0:green:wps";
-			gpios = <&gpio 37 0>;
+			gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
@@ -207,7 +207,7 @@
 			reg = <0>;
 			phy-mode = "rgmii";
 			phy-handle = <&phy0>;
-			// gpios = <&gpio 42 1>;
+			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
 		};
 		ethernet at 5 {
 			compatible = "lantiq,xrx200-pdi-port";
diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts
index 5b4f846..46b047a 100644
--- a/target/linux/lantiq/dts/VG3503J.dts
+++ b/target/linux/lantiq/dts/VG3503J.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "VG3503J - BT OpenReach VDSL Modem";
@@ -90,8 +90,8 @@
 		poll-interval = <100>;
 		reset {
 			label = "reset";
-			gpios = <&gpio 6 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 	};
 
@@ -100,15 +100,15 @@
 
 		power_red: power2 {
 			label = "vg3503j:red:power";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "vg3503j:green:dsl";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
 			label = "vg3503j:green:power";
-			gpios = <&gpio 28 1>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 	};
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index 4f2ae47..b8c5d88 100644
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -1,4 +1,4 @@
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "VGV7510KW22 - o2 Box 6431";
@@ -76,7 +76,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 47 0>;
+			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
@@ -86,7 +86,7 @@
 			interrupt-map = <
 				0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
 				>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;	/* GNT1 */
 		};
 
@@ -115,14 +115,14 @@
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 6 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 9 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -131,48 +131,48 @@
 
 		dsl: dsl {
 			label = "vgv7510kw22:green:dsl";
-			gpios = <&gpio 2 1>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_red {
 			label = "vgv7510kw22:red:internet";
-			gpios = <&gpio 10 1>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 
 		info_red {
 			label = "vgv7510kw22:red:info";
-			gpios = <&gpio 12 1>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_green: power {
 			label = "vgv7510kw22:green:power";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		info_green {
 			label = "vgv7510kw22:green:info";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_green: internet_green {
 			label = "vgv7510kw22:green:internet";
-			gpios = <&gpio 19 1>;
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
 			label = "vgv7510kw22:green:wlan";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power2 {
 			label = "vgv7510kw22:red:power";
-			gpios = <&gpio 28 1>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
 		phone {
 			label = "vgv7510kw22:green:telefon";
-			gpios = <&gpio 29 1>;
+			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/dts/VGV7510KW22BRN.dts
index f93249b..719e7f3 100644
--- a/target/linux/lantiq/dts/VGV7510KW22BRN.dts
+++ b/target/linux/lantiq/dts/VGV7510KW22BRN.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "VGV7510KW22.dtsi"
+#include "VGV7510KW22.dtsi"
 
 / {
 	sram at 1F000000 {
diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
index f68cf5b..399d0cf 100644
--- a/target/linux/lantiq/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "VGV7510KW22.dtsi"
+#include "VGV7510KW22.dtsi"
 
 / {
 	fpi at 10000000 {
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 103a9f5..03f2938 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -1,4 +1,4 @@
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 
@@ -97,13 +97,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 32 0>;
+			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 32 0>;
+			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
@@ -113,7 +113,7 @@
 			interrupt-map = <
 				0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30
 				>;
-			gpio-reset = <&gpio 21 0>;
+			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			req-mask = <0x1>;	/* GNT1 */
 		};
 
@@ -141,23 +141,23 @@
 		poll-interval = <100>;
 		reset {
 			label = "reset";
-			gpios = <&gpio 9 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 		eco {
 			label = "eco";
-			gpios = <&gpio 41 1>;
-			linux,code = <247>;
+			gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		rfkill {
 			label = "rfkill";
-			gpios = <&gpio 45 1>;
-			linux,code = <0xf7>;
+			gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio 10 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -166,60 +166,60 @@
 
 		eco {
 			label = "vgv7519:blue:eco";
-			gpios = <&stp 2 1>;
+			gpios = <&stp 2 GPIO_ACTIVE_LOW>;
 		};
 		wps_red {
 			label = "vgv7519:red:wps";
-			gpios = <&stp 3 1>;
+			gpios = <&stp 3 GPIO_ACTIVE_LOW>;
 		};
 		wps_green {
 			label = "vgv7519:green:wps";
-			gpios = <&stp 4 1>;
+			gpios = <&stp 4 GPIO_ACTIVE_LOW>;
 		};
 		upgrade {
 			label = "vgv7519:blue:upgrade";
-			gpios = <&stp 5 1>;
+			gpios = <&stp 5 GPIO_ACTIVE_LOW>;
 		};
 		tv {
 			label = "vgv7519:green:tv";
-			gpios = <&stp 6 1>;
+			gpios = <&stp 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
 			label = "vgv7519:green:internet";
-			gpios = <&stp 7 1>;
+			gpios = <&stp 7 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
 			label = "vgv7519:red:internet";
-			gpios = <&stp 8 1>;
+			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		broadband_red {
 			label = "vgv7519:red:broadband";
-			gpios = <&stp 9 1>;
+			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		broadband_green: broadband_green {
 			label = "vgv7519:green:broadband";
-			gpios = <&stp 10 1>;
+			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 		voice {
 			label = "vgv7519:green:voice";
-			gpios = <&stp 11 1>;
+			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 		};
 		wireless_red {
 			label = "vgv7519:red:wireless";
-			gpios = <&stp 12 1>;
+			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
 			label = "vgv7519:green:wireless";
-			gpios = <&stp 13 1>;
+			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
 			label = "vgv7519:green:power";
-			gpios = <&stp 14 1>;
+			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power {
 			label = "vgv7519:red:power";
-			gpios = <&stp 15 1>;
+			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts
index b225acf..b6b0393 100644
--- a/target/linux/lantiq/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/dts/VGV7519BRN.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 
-/include/ "VGV7519.dtsi"
+#include "VGV7519.dtsi"
 
 / {
 	fpi at 10000000 {
diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts
index 69b0a1f..72bbd1a 100644
--- a/target/linux/lantiq/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/dts/VGV7519NOR.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
 
-/include/ "VGV7519.dtsi"
+#include "VGV7519.dtsi"
 
 / {
 	fpi at 10000000 {
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts
index 8715b89..777bef9 100644
--- a/target/linux/lantiq/dts/VR200v.dts
+++ b/target/linux/lantiq/dts/VR200v.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "VR200v - TP-LINK Archer VR200v";
@@ -68,13 +68,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -91,27 +91,27 @@
 		poll-interval = <100>;
 		reset {
 			label = "reset";
-			gpios = <&gpio 22 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wifi {
 			label = "wifi";
-			gpios = <&gpio 0 0>;
-			linux,code = <0xf7>;
-			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_RFKILL>;
+			linux,input-type = <EV_SW>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 2 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 
 		dect_paging {
 			label = "dect_paging";
-			gpios = <&gpio 39 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
 
@@ -119,35 +119,35 @@
 		compatible = "gpio-leds";
 		power: power {
 			label = "vr200v:blue:power";
-			gpios = <&gpio 46 1>;
+			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "vr200v:blue:dsl";
-			gpios = <&gpio 4 1>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
 			label = "vr200v:blue:internet";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "vr200v:blue:usb";
-			gpios = <&gpio 25 1>;
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 		};
 		eth {
 			label = "vr200v:blue:lan";
-			gpios = <&gpio 40 1>;
+			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
 		};
 		wlan {
 			label = "vr200v:blue:wlan";
-			gpios = <&gpio 24 1>;
+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 		wlan5g {
 			label = "vr200v:blue:wlan5g";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		phone {
 			label = "vr200v:blue:phone";
-			gpios = <&gpio 44 1>;
+			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
@@ -229,7 +229,7 @@
 			reg = <0>;
 			phy-mode = "rgmii";
 			phy-handle = <&phy0>;
-			// gpios = <&gpio 42 1>;
+			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
 		};
 		ethernet at 5 {
 			compatible = "lantiq,xrx200-pdi-port";
diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 067ca87..07671d6 100644
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "ar9.dtsi"
+#include "ar9.dtsi"
 
 / {
 	model = "WBMR - Buffalo WBMR-HP-G300H";
@@ -101,7 +101,7 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 36 0>;
+			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci at E105400 {
@@ -117,23 +117,23 @@
 
 		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_RFKILL>;
 		};
 		movie {
 			label = "movie";
-			gpios = <&gpio 22 1>;
-			linux,code = <0x109>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_9>;
 		};
 	};
 
@@ -142,40 +142,40 @@
 
 		power_green: power {
 			label = "wbmr:green:power";
-			gpios = <&gpio 1 1>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
 			label = "wbmr:red:power";
-			gpios = <&gpio 5 1>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		security {
 			label = "wbmr:yellow:security";
-			gpios = <&gpio 14 1>;
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
 			label = "wbmr:green:wireless";
-			gpios = <&gpio 15 1>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
 			label = "wbmr:green:dsl";
-			gpios = <&gpio 16 1>;
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
 			label = "wbmr:green:internet";
-			gpios = <&gpio 17 1>;
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
 			label = "wbmr:red:internet";
-			gpios = <&gpio 18 1>;
+			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 		movie {
 			label = "wbmr:blue:movie";
-			gpios = <&gpio 20 1>;
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		usb: usb {
 			label = "wbmr:green:usb";
-			gpios = <&gpio 28 1>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 	};
diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts
index 02ec172..dc0b286 100644
--- a/target/linux/lantiq/dts/WBMR300.dts
+++ b/target/linux/lantiq/dts/WBMR300.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "vr9.dtsi"
+#include "vr9.dtsi"
 
 / {
 	model = "WBMR300 - Buffalo WBMR-300HPD";
@@ -61,13 +61,13 @@
 
 		ifxhcd at E101000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 			lantiq,portmask = <0x3>;
 		};
 
 		ifxhcd at E106000 {
 			status = "okay";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
@@ -79,7 +79,7 @@
 
 	gpio_poweroff {
 		compatible = "gpio-poweroff";
-		gpios = <&gpio 6 1>;
+		gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 	};
 
 	gpio-keys-polled {
@@ -90,34 +90,34 @@
 
 		power {
 			label = "power";
-			gpios = <&gpio 5 1>;
-			linux,code = <0x74>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_POWER>;
 		};
 
 		reset {
 			label = "reset";
-			gpios = <&gpio 7 1>;
-			linux,code = <0x198>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 31 1>;
-			linux,code = <0x211>;
+			gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
 		};
 
 		auto {
 			label = "auto";
-			gpios = <&gpio 48 0>;
-			linux,code = <0x100>;
-			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio 48 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_0>;
+			linux,input-type = <EV_SW>;
 		};
 
 		router {
 			label = "router";
-			gpios = <&gpio 2 0>;
-			linux,code = <0x100>;
-			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
+			linux,code = <BTN_0>;
+			linux,input-type = <EV_SW>;
 		};
 	};
 
@@ -126,68 +126,68 @@
 
 		diag_r: diag_r {
 			label = "wbmr300:red:diag";
-			gpios = <&gpio 0 0>;
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			default_state = "off";
 		};
 
 		wifi_g: wifi_g {
 			label = "wbmr300:green:wifi";
-			gpios = <&gpio 1 0>;
+			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		dsl: dsl {
 			label = "dsl";
-			gpios = <&gpio 4 0>;
+			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_y: router_y {
 			label = "wbmr300:yellow:router";
-			gpios = <&gpio 8 0>;
+			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi_y: wifi_y {
 			label = "wbmr300:yellow:wifi";
-			gpios = <&gpio 9 0>;
+			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan1: lan1 {
 			label = "wbmr300:green:lan1";
-			gpios = <&gpio 11 0>;
+			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan: wan {
 			label = "wbmr300:green:wan";
-			gpios = <&gpio 12 0>;
+			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan3: lan3 {
 			label = "wbmr300:green:lan3";
-			gpios = <&gpio 15 0>;
+			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan2: lan2 {
 			label = "wbmr300:green:lan2";
-			gpios = <&gpio 33 0>;
+			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_g: internet_g {
 			label = "wbmr300:green:internet";
-			gpios = <&gpio 34 0>;
+			gpios = <&gpio 34 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_y: internet_y {
 			label = "wbmr300:yellow:internet";
-			gpios = <&gpio 35 0>;
+			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_g: router_g {
 			label = "wbmr300:green:router";
-			gpios = <&gpio 36 0>;
+			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_g: power_g {
 			label = "wbmr300:green:power";
-			gpios = <&gpio 49 0>;
+			gpios = <&gpio 49 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/amazonse.dtsi b/target/linux/lantiq/dts/amazonse.dtsi
index c586106..84a3a9a 100644
--- a/target/linux/lantiq/dts/amazonse.dtsi
+++ b/target/linux/lantiq/dts/amazonse.dtsi
@@ -1,3 +1,6 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/target/linux/lantiq/dts/ar9.dtsi b/target/linux/lantiq/dts/ar9.dtsi
index e67bcc2..32bed97 100644
--- a/target/linux/lantiq/dts/ar9.dtsi
+++ b/target/linux/lantiq/dts/ar9.dtsi
@@ -1,3 +1,6 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/dts/danube.dtsi
index a785af4..c32ffbe 100644
--- a/target/linux/lantiq/dts/danube.dtsi
+++ b/target/linux/lantiq/dts/danube.dtsi
@@ -1,3 +1,6 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/target/linux/lantiq/dts/vr9.dtsi b/target/linux/lantiq/dts/vr9.dtsi
index a1c05d0..6754afd 100644
--- a/target/linux/lantiq/dts/vr9.dtsi
+++ b/target/linux/lantiq/dts/vr9.dtsi
@@ -1,3 +1,6 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -200,7 +203,7 @@
 			interrupt-parent = <&icu0>;
 			interrupts = <161 144>;
 			compatible = "lantiq,pcie-xrx200";
-			gpio-reset = <&gpio 38 0>;
+			gpio-reset = <&gpio 38 GPIO_ACTIVE_HIGH>;
 		};
 
 		pci0: pci at E105400 {



More information about the lede-commits mailing list