1 files changed, 15 insertions, 6 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index eff4db5de0dd..afd542ad6f97 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -52,6 +52,7 @@ config SOC_IMX25
         select ARCH_MX25
         select COMMON_CLK
         select CPU_ARM926T
+        select HAVE_CAN_FLEXCAN if CAN
         select ARCH_MXC_IOMUX_V3
         select MXC_AVIC
 
@@ -73,12 +74,13 @@ config SOC_IMX31
 
 config SOC_IMX35
         bool
-        select CPU_V6
+        select CPU_V6K
         select ARCH_MXC_IOMUX_V3
         select COMMON_CLK
         select HAVE_EPIT
         select MXC_AVIC
         select SMP_ON_UP if SMP
+        select HAVE_CAN_FLEXCAN if CAN
 
 config SOC_IMX5
         select CPU_V7
@@ -105,6 +107,7 @@ config	SOC_IMX53
         select SOC_IMX5
         select ARCH_MX5
         select ARCH_MX53
+        select HAVE_CAN_FLEXCAN if CAN
 
 if ARCH_IMX_V4_V5
 
@@ -158,7 +161,6 @@ config MACH_MX25_3DS
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMXDI_RTC
         select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_FB
         select IMX_HAVE_PLATFORM_IMX_KEYPAD
         select IMX_HAVE_PLATFORM_IMX_UART
@@ -380,7 +382,6 @@ config MACH_IMX27IPCAM
 config MACH_IMX27_DT
         bool "Support i.MX27 platforms from device tree"
         select SOC_IMX27
-        select USE_OF
         help
           Include support for Freescale i.MX27 based platforms
           using the device tree for discovery
@@ -557,6 +558,14 @@ config MACH_BUG
           Include support for BUGBase 1.3 platform. This includes specific
           configurations for the board and its peripherals.
 
+config MACH_IMX31_DT
+        bool "Support i.MX31 platforms from device tree"
+        select SOC_IMX31
+        select USE_OF
+        help
+          Include support for Freescale i.MX31 based platforms
+          using the device tree for discovery.
+
 comment "MX35 platforms:"
 
 config MACH_PCM043
@@ -589,6 +598,7 @@ config MACH_MX35_3DS
         select IMX_HAVE_PLATFORM_IPU_CORE
         select IMX_HAVE_PLATFORM_MXC_EHCI
         select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_MXC_RTC
         select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         help
           Include support for MX35PDK platform. This includes specific
@@ -663,7 +673,6 @@ comment "i.MX51 machines:"
 config MACH_IMX51_DT
         bool "Support i.MX51 platforms from device tree"
         select SOC_IMX51
-        select USE_OF
         select MACH_MX51_BABBAGE
         help
           Include support for Freescale i.MX51 based platforms
@@ -759,7 +768,6 @@ comment "i.MX53 machines:"
 config MACH_IMX53_DT
         bool "Support i.MX53 platforms from device tree"
         select SOC_IMX53
-        select USE_OF
         select MACH_MX53_ARD
         select MACH_MX53_EVK
         select MACH_MX53_LOCO
@@ -826,13 +834,14 @@ config SOC_IMX6Q
         select COMMON_CLK
         select CPU_V7
         select HAVE_ARM_SCU
+        select HAVE_CAN_FLEXCAN if CAN
         select HAVE_IMX_GPC
         select HAVE_IMX_MMDC
         select HAVE_IMX_SRC
         select HAVE_SMP
+        select MFD_ANATOP
         select PINCTRL
         select PINCTRL_IMX6Q
-        select USE_OF
 
         help
           This enables support for Freescale i.MX6 Quad processor.