From 121264f1e0ca012359e05030c88da2a0c58c3bd3 Mon Sep 17 00:00:00 2001 From: Ram Chandrasekar Date: Sun, 21 Mar 2021 10:46:24 -0700 Subject: [PATCH] ANDROID: GKI: Disable DTPM CPU device Disable DTPM CPU device and keep the DTPM framework enabled to use the framework to register mitigation devices. Bug: 183374898 Change-Id: Ie729793ba5434789f36408b9333d239e37516e8d Signed-off-by: Ram Chandrasekar --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 02199e267fa3..2820803513c0 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -503,7 +503,6 @@ CONFIG_PWM=y CONFIG_GENERIC_PHY=y CONFIG_POWERCAP=y CONFIG_DTPM=y -CONFIG_DTPM_CPU=y CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7586acb562aa..50190a62e329 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -56,7 +56,6 @@ CONFIG_CMDLINE="stack_depot_disable=on" CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set -CONFIG_ENERGY_MODEL=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_TIMES=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -446,7 +445,6 @@ CONFIG_IIO_BUFFER=y CONFIG_IIO_TRIGGER=y CONFIG_POWERCAP=y CONFIG_DTPM=y -CONFIG_DTPM_CPU=y CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y