1 files changed, 5 insertions, 10 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 29a8af6922a8..7a6e6f710068 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -4,13 +4,14 @@ config ARCH_MXC
         select ARM_CPU_SUSPEND if PM
         select ARM_PATCH_PHYS_VIRT
         select AUTO_ZRELADDR if !ZBOOT_ROM
-        select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select COMMON_CLK
         select GENERIC_ALLOCATOR
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
         select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
         select MULTI_IRQ_HANDLER
+        select SOC_BUS
         select SPARSE_IRQ
         select USE_OF
         help
@@ -24,7 +25,7 @@ config MXC_IRQ_PRIOR
         help
           Select this if you want to use prioritized IRQ handling.
           This feature prevents higher priority ISR to be interrupted
-          by lower priority IRQ even IRQF_DISABLED flag is not set.
+          by lower priority IRQ.
           This may be useful in embedded applications, where are strong
           requirements for timing.
           Say N here, unless you have a specialized requirement.
@@ -92,14 +93,12 @@ config MACH_MX27
 config SOC_IMX1
         bool
         select ARCH_MX1
-        select COMMON_CLK
         select CPU_ARM920T
         select IMX_HAVE_IOMUX_V1
         select MXC_AVIC
 
 config SOC_IMX21
         bool
-        select COMMON_CLK
         select CPU_ARM926T
         select IMX_HAVE_IOMUX_V1
         select MXC_AVIC
@@ -108,7 +107,6 @@ config SOC_IMX25
         bool
         select ARCH_MX25
         select ARCH_MXC_IOMUX_V3
-        select COMMON_CLK
         select CPU_ARM926T
         select MXC_AVIC
 
@@ -116,7 +114,6 @@ config SOC_IMX27
         bool
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_OPP
-        select COMMON_CLK
         select CPU_ARM926T
         select IMX_HAVE_IOMUX_V1
         select MACH_MX27
@@ -124,7 +121,6 @@ config SOC_IMX27
 
 config SOC_IMX31
         bool
-        select COMMON_CLK
         select CPU_V6
         select IMX_HAVE_PLATFORM_MXC_RNGA
         select MXC_AVIC
@@ -133,7 +129,6 @@ config SOC_IMX31
 config SOC_IMX35
         bool
         select ARCH_MXC_IOMUX_V3
-        select COMMON_CLK
         select CPU_V6K
         select HAVE_EPIT
         select MXC_AVIC
@@ -144,7 +139,6 @@ config SOC_IMX5
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_OPP
         select ARCH_MXC_IOMUX_V3
-        select COMMON_CLK
         select CPU_V7
         select MXC_TZIC
 
@@ -791,7 +785,6 @@ config SOC_IMX6Q
         select ARM_ERRATA_764369 if SMP
         select ARM_ERRATA_775420
         select ARM_GIC
-        select COMMON_CLK
         select CPU_V7
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
@@ -801,6 +794,8 @@ config SOC_IMX6Q
         select HAVE_IMX_SRC
         select HAVE_SMP
         select MFD_SYSCON
+        select MIGHT_HAVE_PCI
+        select PCI_DOMAINS if PCI
         select PINCTRL
         select PINCTRL_IMX6Q
         select PL310_ERRATA_588369 if CACHE_PL310