From 65343a49009d1e04afa1e82ac7ddf208f84e8ef5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Jun 2020 12:13:51 +0200 Subject: [PATCH] ANDROID: GKI: enable UFS for x86 gki builds and SCSI_UFSHCD_PCI UFS was not being enabled for x86 gki builds, making it hard to test stuff locally. Also enable SCSI_UFSHCD_PCI=y so that the devices that were needing this as a module do not need that anymore, to match up with the SCSI_UFSHCD_PLATFORM setting. Bug: 151050916 Signed-off-by: Greg Kroah-Hartman Change-Id: I8af43e0a55f1467c4bd670dcdefddf3746fdd5ef --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 69603b6ec4ec..c16b079e1e06 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -233,6 +233,7 @@ CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y CONFIG_SCSI_UFSHCD=y +CONFIG_SCSI_UFSHCD_PCI=y CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_CRYPTO=y CONFIG_MD=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 84e3e24a20a8..ce81a61a3a19 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -206,6 +206,10 @@ 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_PCI=y +CONFIG_SCSI_UFSHCD_PLATFORM=y +CONFIG_SCSI_UFS_CRYPTO=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y @@ -345,7 +349,6 @@ CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y CONFIG_REMOTEPROC=y CONFIG_RPMSG_CHAR=y -CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ_EVENT=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y