brcm63xx: make use of dt-includes

Now that we have a dtc command that invokes the preprocessor, make use
of it and replace the magic numbers with KEY_* defines.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46391 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts
index 1b40507..b62c68f 100644 (file)
--- a/target/linux/brcm63xx/dts/a226g.dts
+++ b/target/linux/brcm63xx/dts/a226g.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Pirelli A226G";
@@ -16,12 +18,12 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts
index 011f312..d91fffe 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/a226m-fwb.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Pirelli A226M-FWB";
@@ -16,12 +18,12 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts
index 13400f2..d3f628d 100644 (file)
--- a/target/linux/brcm63xx/dts/a226m.dts
+++ b/target/linux/brcm63xx/dts/a226m.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Pirelli A226M";
@@ -16,12 +18,12 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts
index 1f8eaf6..13c5e50 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/a4001n.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "ADB P.DG A4001N";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts
index 17bd643..e30d6d0 100644 (file)
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/a4001n1.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "ADB P.DG A4001N1";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wlan";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts
index eaa45b9..4662b2d 100644 (file)
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/agpf-s0.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Pirelli Alice Gate AGPF-S0";
@@ -16,12 +18,12 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts
index d5f728a..a148ec4 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5381u.dts
+++ b/target/linux/brcm63xx/dts/ar-5381u.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend AR-5381u";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts
index a8883e2..c30da06 100644 (file)
--- a/target/linux/brcm63xx/dts/ar-5387un.dts
+++ b/target/linux/brcm63xx/dts/ar-5387un.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend AR-5387un";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts
index fdd5c47..0740799 100644 (file)
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/ar1004g.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "ASMAX AR 1004g";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts
index 84b3336..79137db 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96318ref.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6318.dtsi"
+#include "bcm6318.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96318REF reference board";
@@ -16,13 +18,13 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
         };
 

diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
index 5d91d76..be1db5a 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6318.dtsi"
+#include "bcm6318.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96318REF_P300 reference board";
@@ -16,13 +18,13 @@
                wps {
                        label = "wps";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
         };
 

diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
index cbf63ef..f659b39 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm63268.dtsi"
+#include "bcm63268.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM963268BU_P300 reference board";
@@ -16,13 +18,13 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 0 0>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
                        gpios = <&gpio1 1 0>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
         };
 };

diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts
index dcef989..01a7680 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963269bhr.dts
+++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm63268.dtsi"
+#include "bcm63268.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM963269BHR reference board";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 0 0>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
         };
 

diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm963281TAN.dts
index f257125..21b329a 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm963281TAN.dts
+++ b/target/linux/brcm63xx/dts/bcm963281TAN.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom bcm963281TAN reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts
index 8dbdbda..3ed4b22 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96328avng.dts
+++ b/target/linux/brcm63xx/dts/bcm96328avng.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96328avng reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm96338GW.dts
index d378df1..d7af9ef 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96338GW.dts
+++ b/target/linux/brcm63xx/dts/bcm96338GW.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6338.dtsi"
+#include "bcm6338.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96338GW reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm96338W.dts
index 9cca783..4904073 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96338W.dts
+++ b/target/linux/brcm63xx/dts/bcm96338W.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6338.dtsi"
+#include "bcm6338.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96338W reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm96345GW2.dts
index 35417ab..7214185 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96345GW2.dts
+++ b/target/linux/brcm63xx/dts/bcm96345GW2.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6345.dtsi"
+#include "bcm6345.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96345GW2 reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
index 173a8c3..5f60d36 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96348GW-10 reference board";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 6 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
index 15828a1..efd3e91 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96348GW-11 reference board";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts
index fcce239..cf40e52 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348GW.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96348GW reference board";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 4 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm96348R.dts
index 69842b1..d7df2a9 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96348R.dts
+++ b/target/linux/brcm63xx/dts/bcm96348R.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom 96348R reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm96358VW.dts
index 57e26f6..ff92499 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96358VW.dts
+++ b/target/linux/brcm63xx/dts/bcm96358VW.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96358VW reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm96358VW2.dts
index 730426f..8f7070a 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96358VW2.dts
+++ b/target/linux/brcm63xx/dts/bcm96358VW2.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96358VW2 reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
index fa3e6e8..21f1395 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
+++ b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96368MVNgr reference board";

diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm96368MVWG.dts
index 0fb3566..04442ab 100644 (file)
--- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts
+++ b/target/linux/brcm63xx/dts/bcm96368MVWG.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Broadcom BCM96368MVWG reference board";

diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts
index 3cb702d..f00d73e 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva502plus.dts
+++ b/target/linux/brcm63xx/dts/cpva502plus.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Telsey CPVA502+";

diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts
index b9a215a..8d72e02 100644 (file)
--- a/target/linux/brcm63xx/dts/cpva642.dts
+++ b/target/linux/brcm63xx/dts/cpva642.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Telsey CPVA642-type (CPA-ZNTE60T)";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 4 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 5 0>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts
index 7b89bf2..6f452fe 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-5365.dts
+++ b/target/linux/brcm63xx/dts/ct-5365.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend CT-5365";
@@ -16,17 +18,17 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 3 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts
index b8be39d..d6f0f8b 100644 (file)
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/ct-6373.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend CT-6373";
@@ -36,7 +38,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 3 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts
index c92bc90..c05068a 100644 (file)
--- a/target/linux/brcm63xx/dts/ct536plus.dts
+++ b/target/linux/brcm63xx/dts/ct536plus.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend CT-536+/CT-5621T";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts
index d75316b..b61a07c 100644 (file)
--- a/target/linux/brcm63xx/dts/cvg834g.dts
+++ b/target/linux/brcm63xx/dts/cvg834g.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm3368.dtsi"
+#include "bcm3368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Netgear CVG834G";

diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts
index 8cbb3f3..1485300 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834g_v4.dts
+++ b/target/linux/brcm63xx/dts/dg834g_v4.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Netgear DG834G v4";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 6 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts
index f4ece9e..8894358 100644 (file)
--- a/target/linux/brcm63xx/dts/dg834gtpn.dts
+++ b/target/linux/brcm63xx/dts/dg834gtpn.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Netgear DG834GT/PN";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 6 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts
index b349576..8c8c0bf 100644 (file)
--- a/target/linux/brcm63xx/dts/dgnd3700v1.dts
+++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Netgear DGND3700v1/DGND3800B";
@@ -16,17 +18,17 @@
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 12 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 3 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
index 6f2bda6..83b36a5 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2640B rev B2";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 7 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts
index c2b3daf..d3d2772 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2640u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640u.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6338.dtsi"
+#include "bcm6338.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2640U/BRU/C";

diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts
index 7e88e01..2847c18 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-2650u.dts
+++ b/target/linux/brcm63xx/dts/dsl-2650u.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2650U";

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
index 1546b6a..29ae125 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2740B/DSL-2741B rev C2/3";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
index f8ad084..fb1ded7 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2740B/DSL-2741B rev F1";
@@ -16,17 +18,17 @@
                wifi {
                        label = "wifi";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
index 44c4c5e..dd00e2c 100644 (file)
--- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts
+++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6318.dtsi"
+#include "bcm6318.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DSL-2750B/DSL-2751 rev D1";
@@ -16,19 +18,19 @@
                wifi {
                        label = "wifi";
                        gpios = <&gpio0 2 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
 
                wps {
                        label = "wps";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
 
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/dv-201amr.dts
index 9f8660a..f792ac2 100644 (file)
--- a/target/linux/brcm63xx/dts/dv-201amr.dts
+++ b/target/linux/brcm63xx/dts/dv-201amr.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Davolink DV-201AMR";

diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
index 263485d..2009825 100644 (file)
--- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
+++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "D-Link DVA-G3810BN/TL";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts
index 81e1e25..519df1e 100644 (file)
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/f5d7633.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Belkin F5D7633";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 6 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/fast2404.dts
index 92ba6bf..5309703 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2404.dts
+++ b/target/linux/brcm63xx/dts/fast2404.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Sagem F@ST2404";

diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts
index a3bb927..cf453af 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2504n.dts
+++ b/target/linux/brcm63xx/dts/fast2504n.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6362.dtsi"
+#include "bcm6362.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Sagem F@ST2504n";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 25 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts
index b5bc487..c6b71d1 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/fast2604.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Sagem F@ST2604";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts
index 053ad35..3f56827 100644 (file)
--- a/target/linux/brcm63xx/dts/fast2704v2.dts
+++ b/target/linux/brcm63xx/dts/fast2704v2.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6328.dtsi"
+#include "bcm6328.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Sagem F@ST2704V2";
@@ -16,17 +18,17 @@
                rfkill {
                        label = "rfkill";
                        gpios = <&gpio0 15 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts
index a9f8028..69424e0 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6000.dts
+++ b/target/linux/brcm63xx/dts/gw6000.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "TECOM GW6000";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 4 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts
index 2ffdf96..2bd4381 100644 (file)
--- a/target/linux/brcm63xx/dts/gw6200.dts
+++ b/target/linux/brcm63xx/dts/gw6200.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "TECOM GW6200";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 4 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts
index 88647fa..7b6b36f 100644 (file)
--- a/target/linux/brcm63xx/dts/hg520v.dts
+++ b/target/linux/brcm63xx/dts/hg520v.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei EchoLife HG520v";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts
index 4d79824..b23ceaa 100644 (file)
--- a/target/linux/brcm63xx/dts/hg553.dts
+++ b/target/linux/brcm63xx/dts/hg553.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei EchoLife HG553";
@@ -16,13 +18,13 @@
                rfkill {
                        label = "rfkill";
                        gpios = <&gpio0 9 1>;
-                       linux,code = <0xf7>;
+                       linux,code = <KEY_RFKILL>;
                };
 
                reset {
                        label = "reset";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts
index 70f10dc..98e0a83 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-a.dts
+++ b/target/linux/brcm63xx/dts/hg556a-a.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei EchoLife HG556a (version A)";
@@ -16,22 +18,22 @@
                help {
                        label = "help";
                        gpios = <&gpio0 8 1>;
-                       linux,code = <0x8a>;
+                       linux,code = <KEY_HELP>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 9 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                restart {
                        label = "restart";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 11 1>;
-                       linux,code = <0xab>;
+                       linux,code = <KEY_CONFIG>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts
index b42e86f..8a19856 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/hg556a-b.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei EchoLife HG556a (version B)";
@@ -16,22 +18,22 @@
                help {
                        label = "help";
                        gpios = <&gpio0 8 1>;
-                       linux,code = <0x8a>;
+                       linux,code = <KEY_HELP>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 9 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                restart {
                        label = "restart";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 11 1>;
-                       linux,code = <0xab>;
+                       linux,code = <KEY_CONFIG>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts
index 4c845ed..9798091 100644 (file)
--- a/target/linux/brcm63xx/dts/hg556a-c.dts
+++ b/target/linux/brcm63xx/dts/hg556a-c.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei EchoLife HG556a (version C)";
@@ -16,22 +18,22 @@
                help {
                        label = "help";
                        gpios = <&gpio0 8 1>;
-                       linux,code = <0x8a>;
+                       linux,code = <KEY_HELP>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 9 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                restart {
                        label = "restart";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 11 1>;
-                       linux,code = <0xab>;
+                       linux,code = <KEY_CONFIG>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts
index 256233d..b7722df 100644 (file)
--- a/target/linux/brcm63xx/dts/hg655b.dts
+++ b/target/linux/brcm63xx/dts/hg655b.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Huawei HG655b";
@@ -16,17 +18,17 @@
                wps {
                        label = "wps";
                        gpios = <&gpio0 12 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 23 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index 28de528..9e7ce2f 100644 (file)
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "BT Home Hub 2.0 Type A";
@@ -42,12 +44,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 9 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 11 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/livebox-blue-5g.dts
index 523bbe9..bc3d403 100644 (file)
--- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts
+++ b/target/linux/brcm63xx/dts/livebox-blue-5g.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Inventel Livebox 1";
@@ -17,13 +19,13 @@
                button1 {
                        label = "BTN_1";
                        gpios = <&gpio1 4 1>;
-                       linux,code = <0x101>;
+                       linux,code = <BTN_1>;
                };
 
                button2 {
                        label = "BTN_2";
                        gpios = <&gpio0 7 1>;
-                       linux,code = <0x102>;
+                       linux,code = <BTN_2>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts
index bdefbee..b923ee8 100644 (file)
--- a/target/linux/brcm63xx/dts/magic.dts
+++ b/target/linux/brcm63xx/dts/magic.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Alice W-Gate";

diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index 0e9cc24..65f26c7 100644 (file)
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "SFR Neuf Box 4 (Foxconn)";
@@ -36,22 +38,22 @@
                service {
                        label = "service";
                        gpios = <&gpio0 27 1>;
-                       linux,code = <0x100>;
+                       linux,code = <BTN_0>;
                };
                clip {
                        label = "clip";
                        gpios = <&gpio0 31 1>;
-                       linux,code = <0x101>;
+                       linux,code = <BTN_1>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
index d7abbf1..1a48b72 100644 (file)
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "SFR Neuf Box 4 (Sercomm)";
@@ -36,22 +38,22 @@
                service {
                        label = "service";
                        gpios = <&gpio0 27 1>;
-                       linux,code = <0x100>;
+                       linux,code = <BTN_0>;
                };
                clip {
                        label = "clip";
                        gpios = <&gpio0 31 1>;
-                       linux,code = <0x101>;
+                       linux,code = <BTN_1>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
index ae16ad3..c23ff90 100644 (file)
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6362.dtsi"
+#include "bcm6362.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "SFR neufbox 6 (Sercomm)";
@@ -16,22 +18,22 @@
                service {
                        label = "service";
                        gpios = <&gpio0 10 1>;
-                       linux,code = <0x100>;
+                       linux,code = <BTN_0>;
                };
                wlan {
                        label = "wlan";
                        gpios = <&gpio0 12 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio0 24 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio0 25 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 };

diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
index 7c9c65c..606b896 100644 (file)
--- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
+++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Zyxel P870HW-51a v2";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 3 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts
index 824b5e4..503ae57 100644 (file)
--- a/target/linux/brcm63xx/dts/rg100a.dts
+++ b/target/linux/brcm63xx/dts/rg100a.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Alcatel RG100A";

diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/rta1025w.dts
index 91c02f7..5d0dce0 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1025w.dts
+++ b/target/linux/brcm63xx/dts/rta1025w.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Dynalink RTA1025W";

diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts
index 30c1f14..c8c2827 100644 (file)
--- a/target/linux/brcm63xx/dts/rta1320.dts
+++ b/target/linux/brcm63xx/dts/rta1320.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6338.dtsi"
+#include "bcm6338.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Dynalink RTA1320";

diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts
index 73f737a..d24334e 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770bw.dts
+++ b/target/linux/brcm63xx/dts/rta770bw.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6345.dtsi"
+#include "bcm6345.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Siemens Gigaset SE515";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 13 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
         };
 

diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts
index b6c340f..2c2d6fb 100644 (file)
--- a/target/linux/brcm63xx/dts/rta770w.dts
+++ b/target/linux/brcm63xx/dts/rta770w.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6345.dtsi"
+#include "bcm6345.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Dynalink RTA770W";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 13 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
         };
 

diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts
index ed3c322..2dcf752 100644 (file)
--- a/target/linux/brcm63xx/dts/spw303v.dts
+++ b/target/linux/brcm63xx/dts/spw303v.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "T-Com Speedport W303 V";
@@ -16,12 +18,12 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 11 0>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                ses {
                        label = "ses";
                        gpios = <&gpio1 5 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts
index 9c1feff..2fcf958 100644 (file)
--- a/target/linux/brcm63xx/dts/spw500v.dts
+++ b/target/linux/brcm63xx/dts/spw500v.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "T-Com Speedport W500 V";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts
index 74fef37..a1480f6 100644 (file)
--- a/target/linux/brcm63xx/dts/td-w8900gb.dts
+++ b/target/linux/brcm63xx/dts/td-w8900gb.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "TP-Link TD-W8900GB";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts
index b50d597..64a5ab3 100644 (file)
--- a/target/linux/brcm63xx/dts/usr9108.dts
+++ b/target/linux/brcm63xx/dts/usr9108.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "USRobotics 9108";

diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts
index 0721d24..2605339 100644 (file)
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/v2110.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "BT Voyager 2110";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 1 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts
index 5f06c63..5a9223f 100644 (file)
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/v2500v-bb.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6348.dtsi"
+#include "bcm6348.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "BT Voyager V2500V";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 31 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts
index 3d1165c..f95fa95 100644 (file)
--- a/target/linux/brcm63xx/dts/vg50.dts
+++ b/target/linux/brcm63xx/dts/vg50.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm63268.dtsi"
+#include "bcm63268.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Inteno VG50";
@@ -16,13 +18,13 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 0 0>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
                        gpios = <&gpio1 2 0>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
         };
 };

diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts
index a48b8f9..b24b590 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/vr-3025u.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend VR-3025u";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts
index 8dfec31..124045f 100644 (file)
--- a/target/linux/brcm63xx/dts/vr-3025un.dts
+++ b/target/linux/brcm63xx/dts/vr-3025un.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend VR-3025un";
@@ -16,7 +18,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 

diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts
index f7765d5..1c31c57 100644 (file)
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/wap-5813n.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "bcm6368.dtsi"
+#include "bcm6368.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Comtrend WAP-5813n";
@@ -16,17 +18,17 @@
                wlan {
                        label = "wlan";
                        gpios = <&gpio1 0 1>;
-                       linux,code = <0xee>;
+                       linux,code = <KEY_WLAN>;
                };
                reset {
                        label = "reset";
                        gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
                        gpios = <&gpio1 3 1>;
-                       linux,code = <0x211>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };