From 7548ea17aceb69d5a13594a6ad7e414d3705d60a Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Tue, 21 Apr 2020 12:39:21 -0700 Subject: [PATCH] ANDROID: GKI: arm64: gki_defconfig: Set CONFIG_SCSI_UFSHCD=m This change is only for 4.19 kernel and NOT for any later kernels. Bug: 153569404 Change-Id: Iba276fb5d4d4e3aebb0072f5f1e4448991e76410 Signed-off-by: Saravana Kannan --- arch/arm64/configs/gki_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 3c0f86d259de..336dbaf8640f 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -223,8 +223,8 @@ CONFIG_UID_SYS_STATS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_UFSHCD=y -CONFIG_SCSI_UFSHCD_PLATFORM=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PLATFORM=m CONFIG_SCSI_UFS_CRYPTO=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y @@ -378,6 +378,7 @@ CONFIG_COMMON_CLK_SCPI=y CONFIG_HWSPINLOCK=y CONFIG_MAILBOX=y CONFIG_ARM_SMMU=y +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y