summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik/gpio.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-11-25 07:08:27 +0100
committerLinus Walleij <linus.walleij@linaro.org>2011-03-14 14:05:15 +0100
commit3546d15c5c3f923f7925f92bfe0f8e1cf8bccc1c (patch)
treef843669a0be9eb253b5633e9dab1d2a12e4f3df7 /arch/arm/plat-nomadik/gpio.c
parentplat-nomadik: type secondary IRQ correctly (diff)
downloadlinux-3546d15c5c3f923f7925f92bfe0f8e1cf8bccc1c.tar.xz
linux-3546d15c5c3f923f7925f92bfe0f8e1cf8bccc1c.zip
plat-nomadik: set altfunc to GPIO when enabling the sleep config
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/plat-nomadik/gpio.c')
-rw-r--r--arch/arm/plat-nomadik/gpio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index cc9de5964d89..bf299cf34594 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -175,6 +175,8 @@ static void __nmk_config_pin(struct nmk_gpio_chip *nmk_chip, unsigned offset,
int slpm_output = PIN_SLPM_DIR(cfg);
int slpm_val = PIN_SLPM_VAL(cfg);
+ af = NMK_GPIO_ALT_GPIO;
+
/*
* The SLPM_* values are normal values + 1 to allow zero to
* mean "same as normal".