ARM: mvebu: use input DT defines in Armada 370/XP boards

Instead of harcoding keycodes specifications in the Armada 370/XP
boards, use the <dt-bindings/input/input.h> header file and its
keycode definitions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index c28865d2d7da914fa3535eb0f94c9c7b276896f2..3e2c857d600008a896d3402572fedd8d68bbf624 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -12,6 +12,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include "armada-370.dtsi"
 
@@ -101,7 +102,7 @@
                                #size-cells = <0>;
                                button@1 {
                                        label = "Software Button";
-                                       linux,code = <116>;
+                                       linux,code = <KEY_POWER>;
                                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
                                };
                        };

diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index db1ef585606325420bd42e4096f2215ecd37cc91..d83d7d69ac01ff7f33c33677ff16bf7d906d5f1c 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -17,6 +17,7 @@
 
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include "armada-xp-mv78230.dtsi"
 
 / {
@@ -158,7 +159,7 @@
 
                button@1 {
                        label = "Factory Reset Button";
-                       linux,code = <141>; /* KEY_SETUP */
+                       linux,code = <KEY_SETUP>;
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 944acfb0827c47aad6592603523f7ad93b6cb66b..985948ce67b3271a65c9b4a413a99e7d255b12e7 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -12,6 +12,7 @@
 
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include "armada-xp-mv78260.dtsi"
 
 / {
@@ -115,7 +116,7 @@
 
                                button@1 {
                                        label = "Init Button";
-                                       linux,code = <116>;
+                                       linux,code = <KEY_POWER>;
                                        gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
                                };
                        };