UPSTREAM: regulator: helper: Add helper to configure active-discharge using regmap

[firefly-linux-kernel-4.4.55.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 02e8dfaa1ce2d2085bd85e165ad6f25b9697a11a..2098f7d5fd9e91b905635b989d19d8af74e02a6f 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,6 +1,7 @@
 config SUSPEND
        bool "Suspend to RAM and standby"
        depends on ARCH_SUSPEND_POSSIBLE
+       select RTC_LIB
        default y
        ---help---
          Allow the system to enter sleep states in which main memory is
@@ -28,6 +29,19 @@ config SUSPEND_SKIP_SYNC
          of suspend, or they are content with invoking sync() from
          user-space before invoking suspend.  Say Y if that's your case.
 
+config HAS_WAKELOCK
+       bool
+       default y
+
+config WAKELOCK
+       bool "Android's method of preventing suspend"
+       default y
+       ---help---
+         This allows applications to prevent the CPU from suspending while
+         they need it.
+
+         Say Y if you are running an android userspace.
+
 config HIBERNATE_CALLBACKS
        bool