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 12:20:28 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-11-27 00:01:56 +0400
commit279571358df1e3f9788f1095d73b777fdb68c7e0 (patch)
treed5d5eb3573b45d240a00734475f36763dc6f3fe1 /arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
parent817a5b967d5f2c78e9ab41ec91fc44f872201fc6 (diff)
downloadlinux-279571358df1e3f9788f1095d73b777fdb68c7e0.tar.xz
ARM: ux500: move SKE pin config to device tree
This moves the SKE keypad pin control table out of the board file and into the device tree. This was previously set to be active on all MOP500 and HREF boards but after reading the schematic this seems incorrect: the HREFv60 and later uses one of these for MC5 and no reference designs have the SKE connected to any hardware so just leave the pins alone in the power-on state. 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.dtsi7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
index 456a25fbfaee..ee143b0a5baa 100644
--- a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
@@ -91,6 +91,13 @@
ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
};
+ slpm_in_pu_wkup_pdis_en: slpm_in_wkup_pdis_en {
+ ste,sleep = <SLPM_ENABLED>;
+ ste,sleep-input = <SLPM_INPUT_PULLUP>;
+ ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+ ste,sleep-pull-disable = <SLPM_PDIS_ENABLED>;
+ };
+
slpm_out_lo: slpm_out_lo {
ste,sleep = <SLPM_ENABLED>;
ste,sleep-output = <SLPM_OUTPUT_LOW>;