Skip to content

Commit

Permalink
ARM: mvebu: use input DT defines in Armada 370/XP boards
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Petazzoni authored and Jason Cooper committed Feb 11, 2014
1 parent 29e74f8 commit 5c0169d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/armada-370-rd.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*/

/dts-v1/;
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include "armada-370.dtsi"

Expand Down Expand Up @@ -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>;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/armada-xp-axpwifiap.dts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "armada-xp-mv78230.dtsi"

/ {
Expand Down Expand Up @@ -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>;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "armada-xp-mv78260.dtsi"

/ {
Expand Down Expand Up @@ -115,7 +116,7 @@

button@1 {
label = "Init Button";
linux,code = <116>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
};
};
Expand Down

0 comments on commit 5c0169d

Please sign in to comment.