Merge tag 'soc-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 2b09a0471d7b7a8c54e543f88991248073eab282..78f795d73cb64eeae161bda1ea5917aa3bf8fe3d 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -156,6 +156,7 @@ config SOC_IMX5
 
 config SOC_IMX51
        bool
+       select HAVE_IMX_SRC
        select PINCTRL
        select PINCTRL_IMX51
        select SOC_IMX5
@@ -472,8 +473,6 @@ config MACH_MX31ADS_WM1133_EV1
        depends on MACH_MX31ADS
        depends on MFD_WM8350_I2C
        depends on REGULATOR_WM8350 = y
-       select MFD_WM8350_CONFIG_MODE_0
-       select MFD_WM8352_CONFIG_MODE_0
        help
          Include support for the Wolfson Microelectronics 1133-EV1 PMU
          and audio module for the MX31ADS platform.
@@ -781,6 +780,7 @@ comment "Device tree only"
 config SOC_IMX53
        bool "i.MX53 support"
        select HAVE_CAN_FLEXCAN if CAN
+       select HAVE_IMX_SRC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select PINCTRL
        select PINCTRL_IMX53
@@ -800,7 +800,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_ANATOP
        select HAVE_IMX_GPC