ANDROID: Revert "ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS"

CONFIG_PM_WAKELOCKS are needed by existing driver code that uses
APIs like pm_wake_lock/unlock(). We can't disable yet just yet even
though userspace has stopped using the /sys/power/wake_lock interface.

This reverts commit b82fc46d57.

Bug: 148922129
Test: Boot
Change-Id: I8b8f4f46db3647313485abff21a5659bd881b687
Signed-off-by: Sandeep Patil <sspatil@google.com>
This commit is contained in:
Sandeep Patil
2020-02-07 10:09:15 -08:00
committed by Alistair Delva
parent a0c97da799
commit 2256ee3484
2 changed files with 6 additions and 0 deletions

View File

@@ -54,6 +54,9 @@ CONFIG_CP15_BARRIER_EMULATION=y
CONFIG_SETEND_EMULATION=y
CONFIG_RANDOMIZE_BASE=y
# CONFIG_DMI is not set
CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_ENERGY_MODEL=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y

View File

@@ -45,6 +45,9 @@ CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_NR_CPUS=32
CONFIG_EFI=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PM_WAKELOCKS_LIMIT=0
# CONFIG_PM_WAKELOCKS_GC is not set
CONFIG_CPU_FREQ_TIMES=y
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y