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

[linux-2.6-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 314bdf1163f972699e6210e0a0e9b4e5202a5c6b..82dfdeac3595e100a07a001c9e98356420938fe6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -387,6 +387,7 @@ config ARCH_CLPS711X
        select CPU_ARM720T
        select GENERIC_CLOCKEVENTS
        select MFD_SYSCON
+       select SOC_BUS
        help
          Support for Cirrus Logic 711x/721x/731x based boards.
 
@@ -890,6 +891,8 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-meson/Kconfig"
+
 source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-moxart/Kconfig"
@@ -1407,6 +1410,15 @@ config MCPM
          for (multi-)cluster based systems, such as big.LITTLE based
          systems.
 
+config MCPM_QUAD_CLUSTER
+       bool
+       depends on MCPM
+       help
+         To avoid wasting resources unnecessarily, MCPM only supports up
+         to 2 clusters by default.
+         Platforms with 3 or 4 clusters that use MCPM must select this
+         option to allow the additional clusters to be managed.
+
 config BIG_LITTLE
        bool "big.LITTLE support (Experimental)"
        depends on CPU_V7 && SMP