Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk

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

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index c4cc27e5c8a5c22e5439c8ed7ceed322ed45eb8a..842d7ba83101b224fc62bae095a8065307f00112 100644 (file)
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -31,6 +31,15 @@ config CPU_IDLE_GOV_MENU
 config ARCH_NEEDS_CPU_IDLE_COUPLED
        def_bool n
 
+config OF_IDLE_STATES
+        bool "Idle states DT support"
+       depends on ARM || ARM64
+       default n
+       help
+        Allows the CPU idle framework to initialize CPU idle drivers
+        state data by using DT provided nodes compliant with idle states
+        device tree bindings.
+
 if CPU_IDLE
 
 config CPU_IDLE_CALXEDA
@@ -39,4 +48,9 @@ config CPU_IDLE_CALXEDA
        help
          Select this to enable cpuidle on Calxeda processors.
 
+menu "ARM64 CPU Idle Drivers"
+depends on ARM64
+source "drivers/cpuidle/Kconfig.arm64"
+endmenu
+
 endif