summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-15 16:43:02 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-11-27 00:01:56 +0400
commit1a780d45b10eb904be6a923fa09365255b5e733b (patch)
tree15a4f457084bb861dfe013b266a517a68d236ce1 /arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
parent3ae2750a8c7112b83697dda5ef915886cb2a38cf (diff)
downloadlinux-1a780d45b10eb904be6a923fa09365255b5e733b.tar.xz
ARM: ux500: move GPIO key configuration to device tree
This moves over the configuration of the GPIO keys (used for proximity sensor and Hall effect sensor) from the static pin configuration file to the device tree. As part of the exercise, implement the GPIO keys properly in a per-UIB file as this setup actually differs with each UIB. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
index ee143b0a5baa..e6f22b266420 100644
--- a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
@@ -36,6 +36,11 @@
ste,input = <INPUT_PULLUP>;
};
+ gpio_in_pd: gpio_input_pull_down {
+ ste,gpio = <GPIOMODE_ENABLED>;
+ ste,input = <INPUT_PULLDOWN>;
+ };
+
gpio_out_lo: gpio_output_low {
ste,gpio = <GPIOMODE_ENABLED>;
ste,output = <OUTPUT_LOW>;