Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...

[cascardo/linux.git] / drivers / cpuidle / Kconfig.arm

diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index b6d69e8..58bcd0d 100644 (file)
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -1,15 +1,10 @@
 #
 # ARM CPU Idle drivers
 #
-config ARM_ARMADA_370_XP_CPUIDLE
-       bool "CPU Idle Driver for Armada 370/XP family processors"
-       depends on ARCH_MVEBU
-       help
-         Select this to enable cpuidle on Armada 370/XP processors.
-
 config ARM_BIG_LITTLE_CPUIDLE
        bool "Support for ARM big.LITTLE processors"
-       depends on ARCH_VEXPRESS_TC2_PM
+       depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS
+       depends on MCPM
        select ARM_CPU_SUSPEND
        select CPU_IDLE_MULTIPLE_DRIVERS
        help
@@ -33,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE
 
 config ARM_KIRKWOOD_CPUIDLE
        bool "CPU Idle Driver for Marvell Kirkwood SoCs"
-       depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+       depends on MACH_KIRKWOOD
        help
          This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 
@@ -61,3 +56,9 @@ config ARM_EXYNOS_CPUIDLE
        depends on ARCH_EXYNOS
        help
          Select this to enable cpuidle for Exynos processors
+
+config ARM_MVEBU_V7_CPUIDLE
+       bool "CPU Idle Driver for mvebu v7 family processors"
+       depends on ARCH_MVEBU
+       help
+         Select this to enable cpuidle on Armada 370, 38x and XP processors.