ARM: DT: Kirkwood: Use symbolic names from input.h

Replace the numeric key value with a symbolic name from
<bt-bindings/input/input.h>

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 142b9cd3b4541d9fbc8205ad2770c2084a6dfee3..17123f25e2dbc9c87d8e4a1a5e50cf15bec75ffb 100644 (file)
--- 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 aefa375a550d3ac0e7615cd76ba50e83c99ac094..1d680d11f6297a1c36e243d337b1177e34021368 100644 (file)
--- 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 dbc90330c8736eb4a346db16d6196cbe35548334..c376b756cbf29c6952a946da0ddc9a1f6c512d89 100644 (file)
--- 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 399fb0caf5ab3c7e61cac7b0a4e5e8e3810f2de7..52ed7519f64771a9f20df8be4f2f776fb0cedf40 100644 (file)
--- 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 b9de441919e29d785c38e6e7ae10e9695dcc89d8..cdee76904cc42336754a7d7b9ab07cc589b39f2a 100644 (file)
--- 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 bc34a609a1952c46adc3e1f3c6ca39f53b48a6fa..b284474a1cd1b965f42c6959a87db463cc1a4b1a 100644 (file)
--- 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 6317e1d088b3e16b89df5e9620c19f053ac34451..ade432466c85d638faadf6d01c479883e7279064 100644 (file)
--- 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 3b1a365c9a8ee52042b3e00a7bc8ef65ff118ece..57e08b3003a18f8d07b8f53230c0ff4bce0753e5 100644 (file)
--- 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 72a3883f6a044198b19e44095f32f6ac77db21ed..3ce9f631b572772e95a23d843906770ed6891016 100644 (file)
--- 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 2fcb82e208288e6f0d9e72afc7d7650a2ec946aa..3101aecdcc0ad4fd1c32a72ea6009f27467bea0f 100644 (file)
--- 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 b5418bcaeccead3b1313074c5ebf885d5f8f0e49..c45a26ce8b577b08296c32e31e5d4e2dfbd69bc2 100644 (file)
--- 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 ab0212b0e6f58629e593cd6a4e2dbecb5957c166..874df7d26c7c39e909c345ccfa8b6d4438cba927 100644 (file)
--- 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 f0e3d213604c975b760173bc854d624d68e38ccd..6c171e067b59e438694f141e1f04a74d63c9e38a 100644 (file)
--- 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 851fb2a60f20bd7c34401accd522cf6c38aeea67..c97bad46c29c3632c1f9b2073fab6bb48e6e30f8 100644 (file)
--- 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 f755bc1dc604b16b97bd889c1605540875e7080a..89f7094117f4469e0412c25bfae61fa5d30f29b0 100644 (file)
--- 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 345562f7589182975d27ae5e95b1e4319bc7f843..6976afb566053ea1d041f3692174dc7dd8192bd9 100644 (file)
--- 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 8b73c80f1dad40995be65547ee5caa4a4fbffdaa..477c0b5553e8286e9c751b837e85a6b1092c9c6a 100644 (file)
--- 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))