select CLKSRC_IMX_GPT
        select GENERIC_IRQ_CHIP
        select GPIOLIB
-       select PINCTRL
        select PM_OPP if PM
        select SOC_BUS
        select SRAM
 config SOC_IMX35
        bool "i.MX35 support"
        select MXC_AVIC
-       select PINCTRL_IMX35
        help
          This enables support for Freescale i.MX35 processor
 
        bool "i.MX1 support"
        select CPU_ARM920T
        select MXC_AVIC
-       select PINCTRL_IMX1
        help
          This enables support for Freescale i.MX1 processor
 
        bool "i.MX25 support"
        select CPU_ARM926T
        select MXC_AVIC
-       select PINCTRL_IMX25
        help
          This enables support for Freescale i.MX25 processor
 
        bool "i.MX27 support"
        select CPU_ARM926T
        select MXC_AVIC
-       select PINCTRL_IMX27
        help
          This enables support for Freescale i.MX27 processor
 
 
 config SOC_IMX50
        bool "i.MX50 support"
-       select PINCTRL_IMX50
        select SOC_IMX5
 
        help
 
 config SOC_IMX51
        bool "i.MX51 support"
-       select PINCTRL_IMX51
        select SOC_IMX5
        help
          This enables support for Freescale i.MX51 processor
 
 config SOC_IMX53
        bool "i.MX53 support"
-       select PINCTRL_IMX53
        select SOC_IMX5
 
        help
        select ARM_ERRATA_775420
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD
-       select PINCTRL_IMX6Q
        select SOC_IMX6
 
        help
        bool "i.MX6 SoloLite support"
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
-       select PINCTRL_IMX6SL
        select SOC_IMX6
 
        help
        bool "i.MX6 SoloLiteLite support"
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
-       select PINCTRL_IMX6SLL
        select SOC_IMX6
 
        help
        bool "i.MX6 SoloX support"
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
-       select PINCTRL_IMX6SX
        select SOC_IMX6
 
        help
 
 config SOC_IMX6UL
        bool "i.MX6 UltraLite support"
-       select PINCTRL_IMX6UL
        select SOC_IMX6
        select ARM_ERRATA_814220
 
 
 config SOC_IMX7D
        bool "i.MX7 Dual support"
-       select PINCTRL_IMX7D
        select SOC_IMX7D_CA7 if ARCH_MULTI_V7
        select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
        select ARM_ERRATA_814220 if ARCH_MULTI_V7
 config SOC_IMX7ULP
        bool "i.MX7ULP support"
        select CLKSRC_IMX_TPM
-       select PINCTRL_IMX7ULP
        select SOC_IMX7D_CA7 if ARCH_MULTI_V7
        select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
        help
 config SOC_VF610
        bool "Vybrid Family VF610 support"
        select ARM_GIC if ARCH_MULTI_V7
-       select PINCTRL_VF610
 
        help
          This enables support for Freescale Vybrid VF610 processor.
 
 config PINCTRL_IMX1
        bool "IMX1 pinctrl driver"
        depends on SOC_IMX1
+       default 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
+       default SOC_IMX27
        select PINCTRL_IMX1_CORE
        help
          Say Y here to enable the imx27 pinctrl driver
        bool "IMX25 pinctrl driver"
        depends on OF
        depends on SOC_IMX25
+       default 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
+       default 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
+       default 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
+       default 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
+       default 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
+       default 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
+       default SOC_IMX6SL
        select PINCTRL_IMX
        help
          Say Y here to enable the imx6sl pinctrl driver
 config PINCTRL_IMX6SLL
        bool "IMX6SLL pinctrl driver"
        depends on SOC_IMX6SLL
+       default SOC_IMX6SLL
        select PINCTRL_IMX
        help
          Say Y here to enable the imx6sll pinctrl driver
 config PINCTRL_IMX6SX
        bool "IMX6SX pinctrl driver"
        depends on SOC_IMX6SX
+       default SOC_IMX6SX
        select PINCTRL_IMX
        help
          Say Y here to enable the imx6sx pinctrl driver
 config PINCTRL_IMX6UL
        bool "IMX6UL pinctrl driver"
        depends on SOC_IMX6UL
+       default SOC_IMX6UL
        select PINCTRL_IMX
        help
          Say Y here to enable the imx6ul pinctrl driver
 config PINCTRL_IMX7D
        bool "IMX7D pinctrl driver"
        depends on SOC_IMX7D
+       default SOC_IMX7D
        select PINCTRL_IMX
        help
          Say Y here to enable the imx7d pinctrl driver
 config PINCTRL_IMX7ULP
        bool "IMX7ULP pinctrl driver"
        depends on SOC_IMX7ULP
+       default SOC_IMX7ULP
        select PINCTRL_IMX
        help
          Say Y here to enable the imx7ulp pinctrl driver
 config PINCTRL_VF610
        bool "Freescale Vybrid VF610 pinctrl driver"
        depends on SOC_VF610
+       default SOC_VF610
        select PINCTRL_IMX
        help
          Say Y here to enable the Freescale Vybrid VF610 pinctrl driver