Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 67c8db92745480c6f2e3db1e7761e6eac986c12f..ee9f44ad7f02f8aa5dea0a5c1c349128c20e4e32 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