Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index bfd2c2e9f6cd79b03c42dab60fc0e2dd81b4b22f..c6a66de6ed72d0d4e96d061737d4ba3b9a4f3cd3 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -86,7 +86,7 @@ config PINCTRL_BCM2835
 
 config PINCTRL_BCM281XX
        bool "Broadcom BCM281xx pinctrl driver"
-       depends on OF
+       depends on OF && (ARCH_BCM_MOBILE || COMPILE_TEST)
        select PINMUX
        select PINCONF
        select GENERIC_PINCONF
@@ -97,95 +97,6 @@ config PINCTRL_BCM281XX
          BCM28145, and BCM28155 SoCs.  This driver requires the pinctrl
          framework.  GPIO is provided by a separate GPIO driver.
 
-config PINCTRL_IMX
-       bool
-       select PINMUX
-       select PINCONF
-
-config PINCTRL_IMX1_CORE
-       bool
-       select PINMUX
-       select PINCONF
-
-config PINCTRL_IMX1
-       bool "IMX1 pinctrl driver"
-       depends on SOC_IMX1
-       select PINCTRL_IMX1_CORE
-       help
-         Say Y here to enable the imx1 pinctrl driver
-
-config PINCTRL_IMX27
-       bool "IMX27 pinctrl driver"
-       depends on SOC_IMX27
-       select PINCTRL_IMX1_CORE
-       help
-         Say Y here to enable the imx27 pinctrl driver
-
-
-config PINCTRL_IMX25
-        bool "IMX25 pinctrl driver"
-        depends on OF
-        depends on SOC_IMX25
-        select PINCTRL_IMX
-        help
-          Say Y here to enable the imx25 pinctrl driver
-
-config PINCTRL_IMX35
-       bool "IMX35 pinctrl driver"
-       depends on SOC_IMX35
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx35 pinctrl driver
-
-config PINCTRL_IMX50
-       bool "IMX50 pinctrl driver"
-       depends on SOC_IMX50
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx50 pinctrl driver
-
-config PINCTRL_IMX51
-       bool "IMX51 pinctrl driver"
-       depends on SOC_IMX51
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx51 pinctrl driver
-
-config PINCTRL_IMX53
-       bool "IMX53 pinctrl driver"
-       depends on SOC_IMX53
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx53 pinctrl driver
-
-config PINCTRL_IMX6Q
-       bool "IMX6Q/DL pinctrl driver"
-       depends on SOC_IMX6Q
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx6q/dl pinctrl driver
-
-config PINCTRL_IMX6SL
-       bool "IMX6SL pinctrl driver"
-       depends on SOC_IMX6SL
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx6sl pinctrl driver
-
-config PINCTRL_IMX6SX
-       bool "IMX6SX pinctrl driver"
-       depends on SOC_IMX6SX
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the imx6sx pinctrl driver
-
-config PINCTRL_VF610
-       bool "Freescale Vybrid VF610 pinctrl driver"
-       depends on SOC_VF610
-       select PINCTRL_IMX
-       help
-         Say Y here to enable the Freescale Vybrid VF610 pinctrl driver
-
 config PINCTRL_LANTIQ
        bool
        depends on LANTIQ
@@ -197,19 +108,6 @@ config PINCTRL_FALCON
        depends on SOC_FALCON
        depends on PINCTRL_LANTIQ
 
-config PINCTRL_MXS
-       bool
-       select PINMUX
-       select PINCONF
-
-config PINCTRL_IMX23
-       bool
-       select PINCTRL_MXS
-
-config PINCTRL_IMX28
-       bool
-       select PINCTRL_MXS
-
 config PINCTRL_ROCKCHIP
        bool
        select PINMUX
@@ -306,6 +204,7 @@ config PINCTRL_PALMAS
          TPS65913, TPS80036 etc.
 
 source "drivers/pinctrl/berlin/Kconfig"
+source "drivers/pinctrl/freescale/Kconfig"
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/nomadik/Kconfig"
 source "drivers/pinctrl/qcom/Kconfig"