diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 11:24:34 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 14:42:57 +0200 |
| commit | 0fa7be407dc101afe2d3dc99ded99de34c967a52 (patch) | |
| tree | 457d3a7938b073d31b1e2c23ec75abfda0b4eaac /arch/arm/plat-nomadik/include | |
| parent | 7af07ad902cce88ebbd2ce0e681d0c541e8f95fa (diff) | |
| download | linux-3.10-0fa7be407dc101afe2d3dc99ded99de34c967a52.tar.gz linux-3.10-0fa7be407dc101afe2d3dc99ded99de34c967a52.tar.bz2 linux-3.10-0fa7be407dc101afe2d3dc99ded99de34c967a52.zip | |
ARM: nomadik: enable PINCTRL_NOMADIK where needed
The nomadik gpio code has been converted to pinctrl, but the nomadik platform
still expects the old code to be present. Change it to use the new one instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/plat-nomadik/include')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h index 3e8b7f16fb7..826de74bfdd 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h +++ b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h @@ -62,7 +62,14 @@ enum nmk_gpio_slpm { extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode); extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull); +#ifdef CONFIG_PINCTRL_NOMADIK extern int nmk_gpio_set_mode(int gpio, int gpio_mode); +#else +static inline int nmk_gpio_set_mode(int gpio, int gpio_mode) +{ + return -ENODEV; +} +#endif extern int nmk_gpio_get_mode(int gpio); extern void nmk_gpio_wakeups_suspend(void); |