diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 142b9cd..17123f2 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -66,7 +66,7 @@
 
 		button@1 {
 			label = "Power push button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio0 16 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index aefa375..1d680d1 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -15,17 +15,17 @@
 
 		button@1 {
 			label = "Power button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 2 1>;
 		};
 		button@2 {
 			label = "USB unmount button";
-			linux,code = <161>;
+			linux,code = <KEY_EJECTCD>;
 			gpios = <&gpio1 15 1>;
 		};
 		button@3 {
 			label = "Reset button";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 16 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index dbc9033..c376b75 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -63,12 +63,12 @@
 
 		button@1 {
 			label = "USB Copy";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio0 29 1>;
 		};
 		button@2 {
 			label = "Reset";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio0 28 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 399fb0c..52ed751 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -137,13 +137,13 @@
 
 		button@1 {
 			label = "OTB Button";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio1 3 1>;
 			debounce-interval = <100>;
 		};
 		button@2 {
 			label = "Reset";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio0 12 1>;
 			debounce-interval = <100>;
 		};
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index b9de441..cdee769 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -154,17 +154,17 @@
 
 		Power {
 			label = "Power Button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio0 14 1>;
 		};
 		Reset {
 			label = "Reset Button";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio0 12 1>;
 		};
 		OTB {
 			label = "OTB Button";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio1 3 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index bc34a60..b284474 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -108,18 +108,18 @@
 
 		button@1 {
 			label = "Function Button";
-			linux,code = <357>;
+			linux,code = <KEY_OPTION>;
 			gpios = <&gpio1 9 1>;
 		};
 		button@2 {
 			label = "Power-on Switch";
-			linux,code = <0>;
+			linux,code = <KEY_RESERVED>;
 			linux,input-type = <5>;
 			gpios = <&gpio1 10 1>;
 		};
 		button@3 {
 			label = "Power-auto Switch";
-			linux,code = <1>;
+			linux,code = <KEY_ESC>;
 			linux,input-type = <5>;
 			gpios = <&gpio1 11 1>;
 		};
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 6317e1d..ade4324 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -113,12 +113,12 @@
 
 		button@1 {
 			label = "SWR Button";
-			linux,code = <0x198>; /* KEY_RESTART */
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 15 1>;
 		};
 		button@2 {
 			label = "WPS Button";
-			linux,code = <0x211>; /* KEY_WPS_BUTTON */
+			linux,code = <KEY_WPS_BUTTON>;
 			gpios = <&gpio1 14 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 3b1a365..57e08b3 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -11,7 +11,6 @@
 
 /dts-v1/;
 
-#include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "kirkwood.dtsi"
 #include "kirkwood-6282.dtsi"
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index 72a3883..3ce9f63 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -11,7 +11,6 @@
 
 /dts-v1/;
 
-#include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "kirkwood.dtsi"
 #include "kirkwood-6282.dtsi"
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 2fcb82e..3101aec 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -64,7 +64,7 @@
 
 		button@1 {
 			label = "Power push button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 0 0>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index b5418bc..c45a26c 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -119,17 +119,17 @@
 
 		button@1 {
 			label = "Power Button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 14 0>;
 		};
 		button@2 {
 			label = "Copy Button";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio1 5 1>;
 		};
 		button@3 {
 			label = "Reset Button";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 4 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index ab0212b..874df7d 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -107,17 +107,17 @@
 
 		button@1 {
 			label = "Power Button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 14 0>;
 		};
 		button@2 {
 			label = "Copy Button";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio1 5 1>;
 		};
 		button@3 {
 			label = "Reset Button";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 4 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index f0e3d21..6c171e0 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -124,7 +124,7 @@
 
 		button@1 {
 			label = "Init Button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 6 0>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 851fb2a..c97bad4 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -149,7 +149,7 @@
 
 		button@1 {
 			label = "Init Button";
-			linux,code = <116>;
+			linux,code = <KEY_POWER>;
 			gpios = <&gpio1 6 0>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index f755bc1..89f7094 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -41,12 +41,12 @@
 
 		button@1 {
 			label = "USB Copy";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio0 15 1>;
 		};
 		button@2 {
 			label = "Reset";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio0 16 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 345562f..6976afb 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -51,12 +51,12 @@
 
 		button@1 {
 			label = "USB Copy";
-			linux,code = <133>;
+			linux,code = <KEY_COPY>;
 			gpios = <&gpio1 11 1>;
 		};
 		button@2 {
 			label = "Reset";
-			linux,code = <0x198>;
+			linux,code = <KEY_RESTART>;
 			gpios = <&gpio1 5 1>;
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 8b73c80..477c0b5 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,4 +1,5 @@
 /include/ "skeleton.dtsi"
+#include <dt-bindings/input/input.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))