提交 0fa7be40 编写于 作者: A Arnd Bergmann

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: NArnd Bergmann <arnd@arndb.de>
Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
上级 7af07ad9
...@@ -947,6 +947,7 @@ config ARCH_NOMADIK ...@@ -947,6 +947,7 @@ config ARCH_NOMADIK
select CPU_ARM926T select CPU_ARM926T
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select PINCTRL
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
help help
......
...@@ -97,6 +97,7 @@ CONFIG_I2C=y ...@@ -97,6 +97,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y CONFIG_I2C_GPIO=y
CONFIG_DEBUG_GPIO=y CONFIG_DEBUG_GPIO=y
CONFIG_PINCTRL_NOMADIK=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
# CONFIG_VGA_CONSOLE is not set # CONFIG_VGA_CONSOLE is not set
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
......
...@@ -15,6 +15,7 @@ config NOMADIK_8815 ...@@ -15,6 +15,7 @@ config NOMADIK_8815
config I2C_BITBANG_8815NHK config I2C_BITBANG_8815NHK
tristate "Driver for bit-bang busses found on the 8815 NHK" tristate "Driver for bit-bang busses found on the 8815 NHK"
depends on I2C && MACH_NOMADIK_8815NHK depends on I2C && MACH_NOMADIK_8815NHK
depends on PINCTRL_NOMADIK
select I2C_ALGOBIT select I2C_ALGOBIT
default y default y
......
...@@ -62,7 +62,14 @@ enum nmk_gpio_slpm { ...@@ -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_slpm(int gpio, enum nmk_gpio_slpm mode);
extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull); 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); 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 int nmk_gpio_get_mode(int gpio);
extern void nmk_gpio_wakeups_suspend(void); extern void nmk_gpio_wakeups_suspend(void);
......
...@@ -66,7 +66,7 @@ config PINCTRL_IMX28 ...@@ -66,7 +66,7 @@ config PINCTRL_IMX28
config PINCTRL_NOMADIK config PINCTRL_NOMADIK
bool "Nomadik pin controller driver" bool "Nomadik pin controller driver"
depends on ARCH_U8500 depends on ARCH_U8500 || ARCH_NOMADIK
select PINMUX select PINMUX
select PINCONF select PINCONF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册