Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d014f22..ee9f44a 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -96,6 +96,14 @@ config PINCTRL_FALCON
        depends on SOC_FALCON
        depends on PINCTRL_LANTIQ
 
+config PINCTRL_MESON
+       bool
+       select PINMUX
+       select PINCONF
+       select GENERIC_PINCONF
+       select OF_GPIO
+       select REGMAP_MMIO
+
 config PINCTRL_ROCKCHIP
        bool
        select PINMUX
@@ -113,7 +121,7 @@ config PINCTRL_SINGLE
          This selects the device tree based generic pinctrl driver.
 
 config PINCTRL_SIRF
-       bool "CSR SiRFprimaII/SiRFmarco pin controller driver"
+       bool "CSR SiRFprimaII pin controller driver"
        depends on ARCH_SIRF
        select PINMUX
        select GPIOLIB_IRQCHIP
@@ -191,6 +199,14 @@ config PINCTRL_PALMAS
          open drain configuration for the Palmas series devices like
          TPS65913, TPS80036 etc.
 
+config PINCTRL_ZYNQ
+       bool "Pinctrl driver for Xilinx Zynq"
+       depends on ARCH_ZYNQ
+       select PINMUX
+       select GENERIC_PINCONF
+       help
+         This selectes the pinctrl driver for Xilinx Zynq.
+
 source "drivers/pinctrl/berlin/Kconfig"
 source "drivers/pinctrl/freescale/Kconfig"
 source "drivers/pinctrl/intel/Kconfig"