aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-11 12:07:13 -0500
committerJason Cooper <jason@lakedaemon.net>2014-02-11 14:35:39 -0500
commit5c0169d1c503aab2d62ee6f6e342a78e2ea9e3ed (patch)
tree31d2582ebca9c33043d0ed674f8489c0f05b4682 /arch
parent29e74f8bd71e70f5fe97685ba2cdf12b78791883 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/armada-370-rd.dts3
-rw-r--r--arch/arm/boot/dts/armada-xp-axpwifiap.dts3
-rw-r--r--arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts3
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index c28865d2d7da..3e2c857d6000 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -12,6 +12,7 @@
12 */ 12 */
13 13
14/dts-v1/; 14/dts-v1/;
15#include <dt-bindings/input/input.h>
15#include <dt-bindings/gpio/gpio.h> 16#include <dt-bindings/gpio/gpio.h>
16#include "armada-370.dtsi" 17#include "armada-370.dtsi"
17 18
@@ -101,7 +102,7 @@
101 #size-cells = <0>; 102 #size-cells = <0>;
102 button@1 { 103 button@1 {
103 label = "Software Button"; 104 label = "Software Button";
104 linux,code = <116>; 105 linux,code = <KEY_POWER>;
105 gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 106 gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
106 }; 107 };
107 }; 108 };
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index db1ef5856063..d83d7d69ac01 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -17,6 +17,7 @@
17 17
18/dts-v1/; 18/dts-v1/;
19#include <dt-bindings/gpio/gpio.h> 19#include <dt-bindings/gpio/gpio.h>
20#include <dt-bindings/input/input.h>
20#include "armada-xp-mv78230.dtsi" 21#include "armada-xp-mv78230.dtsi"
21 22
22/ { 23/ {
@@ -158,7 +159,7 @@
158 159
159 button@1 { 160 button@1 {
160 label = "Factory Reset Button"; 161 label = "Factory Reset Button";
161 linux,code = <141>; /* KEY_SETUP */ 162 linux,code = <KEY_SETUP>;
162 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; 163 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
163 }; 164 };
164 }; 165 };
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 944acfb0827c..985948ce67b3 100644
--- 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 @@
12 12
13/dts-v1/; 13/dts-v1/;
14#include <dt-bindings/gpio/gpio.h> 14#include <dt-bindings/gpio/gpio.h>
15#include <dt-bindings/input/input.h>
15#include "armada-xp-mv78260.dtsi" 16#include "armada-xp-mv78260.dtsi"
16 17
17/ { 18/ {
@@ -115,7 +116,7 @@
115 116
116 button@1 { 117 button@1 {
117 label = "Init Button"; 118 label = "Init Button";
118 linux,code = <116>; 119 linux,code = <KEY_POWER>;
119 gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; 120 gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
120 }; 121 };
121 }; 122 };