Merge branch 'acpi-bind'

[firefly-linux-kernel-4.4.55.git] / drivers / cpuidle / Kconfig

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index e21cdfa4002a17bc28f1285dfe3433bb1ba195b5..b3fb81d7cf0410bb9358d94a4e345899323f1ef3 100644 (file)
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -1,7 +1,10 @@
+menu "CPU Idle"
 
 config CPU_IDLE
        bool "CPU idle PM support"
        default y if ACPI || PPC_PSERIES
+       select CPU_IDLE_GOV_LADDER if (!NO_HZ && !NO_HZ_IDLE)
+       select CPU_IDLE_GOV_MENU if (NO_HZ || NO_HZ_IDLE)
        help
          CPU idle is a generic framework for supporting software-controlled
          idle processor power management.  It includes modular cross-platform
@@ -9,9 +12,10 @@ config CPU_IDLE
 
          If you're using an ACPI-enabled platform, you should say Y here.
 
+if CPU_IDLE
+
 config CPU_IDLE_MULTIPLE_DRIVERS
         bool "Support multiple cpuidle drivers"
-        depends on CPU_IDLE
         default n
         help
          Allows the cpuidle framework to use different drivers for each CPU.
@@ -19,25 +23,20 @@ config CPU_IDLE_MULTIPLE_DRIVERS
          states. If unsure say N.
 
 config CPU_IDLE_GOV_LADDER
-       bool
-       depends on CPU_IDLE
+       bool "Ladder governor (for periodic timer tick)"
        default y
 
 config CPU_IDLE_GOV_MENU
-       bool
-       depends on CPU_IDLE && NO_HZ
+       bool "Menu governor (for tickless system)"
        default y
 
-config ARCH_NEEDS_CPU_IDLE_COUPLED
-       def_bool n
-
-if CPU_IDLE
-
-config CPU_IDLE_CALXEDA
-       bool "CPU Idle Driver for Calxeda processors"
-       depends on ARCH_HIGHBANK
-       select ARM_CPU_SUSPEND
-       help
-         Select this to enable cpuidle on Calxeda processors.
+menu "ARM CPU Idle Drivers"
+depends on ARM
+source "drivers/cpuidle/Kconfig.arm"
+endmenu
 
 endif
+
+config ARCH_NEEDS_CPU_IDLE_COUPLED
+       def_bool n
+endmenu