diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-11-16 22:25:02 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-12-31 09:36:22 +0800 |
| commit | f7f3d4b29fefe62acb39069aaf37196c01e0f23a (patch) | |
| tree | bfd96754c1bb7ac27b2cc84644a192150d8bdeaa /arch/arm/mach-imx | |
| parent | 8202a3ce9ccc6a6bfdae072b8c735a1f894f8b74 (diff) | |
| download | linux-stable-f7f3d4b29fefe62acb39069aaf37196c01e0f23a.tar.gz linux-stable-f7f3d4b29fefe62acb39069aaf37196c01e0f23a.tar.bz2 linux-stable-f7f3d4b29fefe62acb39069aaf37196c01e0f23a.zip | |
ARM: imx: select PINCTRL at sub-architecure level
Instead of selecting PINCTRL on individual SoC, let's select it at IMX
sub-architecure level.
While at it, it also adds the missing PINCTRL_IMX50 selection for
SOC_IMX50.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index f35da31a0144..d511e0546546 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -11,6 +11,7 @@ config ARCH_MXC select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 select MULTI_IRQ_HANDLER + select PINCTRL select SOC_BUS select SPARSE_IRQ select USE_OF @@ -99,7 +100,6 @@ config SOC_IMX25 select ARCH_MXC_IOMUX_V3 select CPU_ARM926T select MXC_AVIC - select PINCTRL select PINCTRL_IMX25 config SOC_IMX27 @@ -110,7 +110,6 @@ config SOC_IMX27 select IMX_HAVE_IOMUX_V1 select MACH_MX27 select MXC_AVIC - select PINCTRL select PINCTRL_IMX27 config SOC_IMX31 @@ -139,7 +138,6 @@ config SOC_IMX5 config SOC_IMX51 bool select HAVE_IMX_SRC - select PINCTRL select PINCTRL_IMX51 select SOC_IMX5 @@ -763,6 +761,7 @@ comment "Device tree only" config SOC_IMX50 bool "i.MX50 support" select HAVE_IMX_SRC + select PINCTRL_IMX50 select SOC_IMX5 help @@ -772,7 +771,6 @@ config SOC_IMX53 bool "i.MX53 support" select HAVE_IMX_SRC select IMX_HAVE_PLATFORM_IMX2_WDT - select PINCTRL select PINCTRL_IMX53 select SOC_IMX5 @@ -798,7 +796,6 @@ config SOC_IMX6Q select MFD_SYSCON select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI - select PINCTRL select PINCTRL_IMX6Q select PL310_ERRATA_588369 if CACHE_PL310 select PL310_ERRATA_727915 if CACHE_PL310 @@ -819,7 +816,6 @@ config SOC_IMX6SL select HAVE_IMX_MMDC select HAVE_IMX_SRC select MFD_SYSCON - select PINCTRL select PINCTRL_IMX6SL select PL310_ERRATA_588369 if CACHE_PL310 select PL310_ERRATA_727915 if CACHE_PL310 @@ -833,7 +829,6 @@ config SOC_VF610 select CPU_V7 select ARM_GIC select CLKSRC_OF - select PINCTRL select PINCTRL_VF610 select VF_PIT_TIMER select PL310_ERRATA_588369 if CACHE_PL310 |