Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-zesty-kernel.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 45d2158a537492cd946aa9d2ee348b7490fad726..7bf914df6e91a6129d23f5d12828b8228a8c2775 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -26,11 +26,24 @@ config DEBUG_PINCTRL
        help
          Say Y here to add some extra checks and diagnostics to PINCTRL calls.
 
+config PINCTRL_BCM2835
+       bool
+       select PINMUX
+       select PINCONF
+
 config PINCTRL_IMX
        bool
        select PINMUX
        select PINCONF
 
+config PINCTRL_IMX35
+       bool "IMX35 pinctrl driver"
+       depends on OF
+       depends on SOC_IMX35
+       select PINCTRL_IMX
+       help
+         Say Y here to enable the imx35 pinctrl driver
+
 config PINCTRL_IMX51
        bool "IMX51 pinctrl driver"
        depends on OF
@@ -97,10 +110,18 @@ config PINCTRL_NOMADIK
        select PINMUX
        select PINCONF
 
+config PINCTRL_STN8815
+       bool "STN8815 pin controller driver"
+       depends on PINCTRL_NOMADIK && ARCH_NOMADIK
+
 config PINCTRL_DB8500
        bool "DB8500 pin controller driver"
        depends on PINCTRL_NOMADIK && ARCH_U8500
 
+config PINCTRL_DB8540
+       bool "DB8540 pin controller driver"
+       depends on PINCTRL_NOMADIK && ARCH_U8500
+
 config PINCTRL_PXA168
        bool "PXA168 pin controller driver"
        depends on ARCH_MMP
@@ -156,6 +177,37 @@ config PINCTRL_COH901
          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
          ports of 8 GPIO pins each.
 
+config PINCTRL_SAMSUNG
+       bool "Samsung pinctrl driver"
+       select PINMUX
+       select PINCONF
+
+config PINCTRL_EXYNOS4
+       bool "Pinctrl driver data for Exynos4 SoC"
+       select PINCTRL_SAMSUNG
+
+config PINCTRL_MVEBU
+       bool
+       depends on ARCH_MVEBU
+       select PINMUX
+       select PINCONF
+
+config PINCTRL_DOVE
+       bool
+       select PINCTRL_MVEBU
+
+config PINCTRL_KIRKWOOD
+       bool
+       select PINCTRL_MVEBU
+
+config PINCTRL_ARMADA_370
+       bool
+       select PINCTRL_MVEBU
+
+config PINCTRL_ARMADA_XP
+       bool
+       select PINCTRL_MVEBU
+
 source "drivers/pinctrl/spear/Kconfig"
 
 config PINCTRL_XWAY