Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...

[sfrench/cifs-2.6.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6d9ae09e24949e0447c7d3b5663fbe0f7ceb2502..2ebc97e16b911da6c33df4e78b80d02b6a7cc036 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -83,24 +83,12 @@ config ARCH_MXC_IOMUX_V3
 config ARCH_MX1
        bool
 
-config MACH_MX21
-       bool
-
 config ARCH_MX25
        bool
 
 config MACH_MX27
        bool
 
-config ARCH_MX5
-       bool
-
-config ARCH_MX51
-       bool
-
-config ARCH_MX53
-       bool
-
 config SOC_IMX1
        bool
        select ARCH_MX1
@@ -114,7 +102,6 @@ config SOC_IMX21
        select COMMON_CLK
        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
-       select MACH_MX21
        select MXC_AVIC
 
 config SOC_IMX25
@@ -155,7 +142,6 @@ config SOC_IMX35
 config SOC_IMX5
        bool
        select ARCH_HAS_CPUFREQ
-       select ARCH_MX5
        select ARCH_MXC_IOMUX_V3
        select COMMON_CLK
        select CPU_V7
@@ -163,8 +149,7 @@ config SOC_IMX5
 
 config SOC_IMX51
        bool
-       select ARCH_MX5
-       select ARCH_MX51
+       select HAVE_IMX_SRC
        select PINCTRL
        select PINCTRL_IMX51
        select SOC_IMX5
@@ -787,9 +772,8 @@ comment "Device tree only"
 
 config SOC_IMX53
        bool "i.MX53 support"
-       select ARCH_MX5
-       select ARCH_MX53
        select HAVE_CAN_FLEXCAN if CAN
+       select HAVE_IMX_SRC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select PINCTRL
        select PINCTRL_IMX53
@@ -809,7 +793,8 @@ config SOC_IMX6Q
        select ARM_GIC
        select COMMON_CLK
        select CPU_V7
-       select HAVE_ARM_SCU
+       select HAVE_ARM_SCU if SMP
+       select HAVE_ARM_TWD if LOCAL_TIMERS
        select HAVE_CAN_FLEXCAN if CAN
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC