diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-05 23:18:49 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-05 23:18:49 +0200 |
| commit | 186a73dc9a81b087d0708f21a990615957ec9c1c (patch) | |
| tree | a1db8d517665fb27f25d44eacacd4b80a0d540ed /arch/arm/boot/dts/armada-xp-axpwifiap.dts | |
| parent | Merge tag 'versatile-leds' of git://git.kernel.org/pub/scm/linux/kernel/git/l... (diff) | |
| parent | ARM: qcom: clean-up unneeded kconfig selects (diff) | |
| download | linux-186a73dc9a81b087d0708f21a990615957ec9c1c.tar.xz linux-186a73dc9a81b087d0708f21a990615957ec9c1c.zip | |
Merge tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup
Merge Kconfig cleanups from Rob Herring:
Several mach kconfig clean-ups of redundant selects
* tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ARM: qcom: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: mvebu: clean-up unneeded kconfig selects
+ Linux 3.15-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp-axpwifiap.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-axpwifiap.dts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index c5fe57269f5a..d83d7d69ac01 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -16,6 +16,8 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include "armada-xp-mv78230.dtsi" / { @@ -157,8 +159,8 @@ button@1 { label = "Factory Reset Button"; - linux,code = <141>; /* KEY_SETUP */ - gpios = <&gpio1 1 1>; + linux,code = <KEY_SETUP>; + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; }; }; |