Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fa7be40 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7af07ad9

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ config ARCH_NOMADIK 
	select CPU_ARM926T

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select PINCTRL

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_REQUIRE_GPIOLIB

	help

arch/arm/configs/nhk8815_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_I2C=y 
CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_DEBUG_GPIO=y

CONFIG_PINCTRL_NOMADIK=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_RTC_CLASS=y

arch/arm/mach-nomadik/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config NOMADIK_8815 
config I2C_BITBANG_8815NHK

	tristate "Driver for bit-bang busses found on the 8815 NHK"

	depends on I2C && MACH_NOMADIK_8815NHK

	depends on PINCTRL_NOMADIK

	select I2C_ALGOBIT

	default y

arch/arm/plat-nomadik/include/plat/gpio-nomadik.h

+7 −0
Original line number Diff line number Diff line
@@ -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);

drivers/pinctrl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config PINCTRL_IMX28 


config PINCTRL_NOMADIK

	bool "Nomadik pin controller driver"

	depends on ARCH_U8500

	depends on ARCH_U8500 || ARCH_NOMADIK

	select PINMUX

	select PINCONF