diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-13 04:57:34 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-13 04:57:34 +0200 |
| commit | 7af07ad902cce88ebbd2ce0e681d0c541e8f95fa (patch) | |
| tree | 40a5aedb583c35d16505d96ea8996c413a747fe6 /drivers/pinctrl/Kconfig | |
| parent | Merge branch 'spear/pinctrl' into next/pinctrl (diff) | |
| parent | ARM: ux500: switch MSP to using pinctrl for pins (diff) | |
| download | linux-7af07ad902cce88ebbd2ce0e681d0c541e8f95fa.tar.xz linux-7af07ad902cce88ebbd2ce0e681d0c541e8f95fa.zip | |
Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/pinctrl
ux500 GPIO and pinctrl changes for kernel 3.5
* tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: switch MSP to using pinctrl for pins
ARM: ux500: alter MSP registration to return a device pointer
ARM: ux500: switch to using pinctrl for uart0
ARM: ux500: delete custom pin control system
ARM: ux500: switch over to Nomadik pinctrl driver
pinctrl: add sleep state definition
pinctrl/nomadik: implement pin configuration
pinctrl/nomadik: implement pin multiplexing
pinctrl/nomadik: reuse GPIO debug function for pins
pinctrl/nomadik: break out single GPIO debug function
pinctrl/nomadik: basic Nomadik pinctrl interface
pinctrl/nomadik: !CONFIG_OF build error
gpio: move the Nomadik GPIO driver to pinctrl
Context conflicts resolved in drivers/pinctrl/Kconfig and
drivers/pinctrl/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pinctrl/Kconfig')
| -rw-r--r-- | drivers/pinctrl/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index a54a93112cba..cc01c758bbfc 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -64,6 +64,16 @@ config PINCTRL_IMX28 select PINCONF select PINCTRL_MXS +config PINCTRL_NOMADIK + bool "Nomadik pin controller driver" + depends on ARCH_U8500 + select PINMUX + select PINCONF + +config PINCTRL_DB8500 + bool "DB8500 pin controller driver" + depends on PINCTRL_NOMADIK && ARCH_U8500 + config PINCTRL_PXA168 bool "PXA168 pin controller driver" depends on ARCH_MMP |