From bafb8fb005a4b179a1bdc124c8a6ea4005967c85 Mon Sep 17 00:00:00 2001 From: Nitin Rawat Date: Fri, 26 Jun 2020 10:17:50 +0530 Subject: [PATCH] arm64: defconfig: Move to upstream ufshcd core This change will move ufshcd core to the upstream version. Change-Id: I5344d3cd1350a9ef76c1cca18ae401972f9cd206 Signed-off-by: Nitin Rawat --- arch/arm64/configs/vendor/holi_GKI.config | 3 ++- arch/arm64/configs/vendor/holi_QGKI.config | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/holi_GKI.config b/arch/arm64/configs/vendor/holi_GKI.config index ea66bbdf7a95..6b3958d5e8ef 100644 --- a/arch/arm64/configs/vendor/holi_GKI.config +++ b/arch/arm64/configs/vendor/holi_GKI.config @@ -34,8 +34,9 @@ CONFIG_UCSI_QTI_GLINK=m CONFIG_INTERCONNECT_QCOM=m CONFIG_PHY_QCOM_UFS=m CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m -CONFIG_PHY_QCOM_UFS_V4=m +CONFIG_PHY_QCOM_UFS_V3=m CONFIG_SCSI_UFS_QCOM=m +CONFIG_SCSI_UFS_BSG=y CONFIG_MSM_CORE_HANG_DETECT=m CONFIG_PANIC_ON_OOPS=y CONFIG_QCOM_IPCC=m diff --git a/arch/arm64/configs/vendor/holi_QGKI.config b/arch/arm64/configs/vendor/holi_QGKI.config index 14c4b57b4dd2..ed044e4d3920 100644 --- a/arch/arm64/configs/vendor/holi_QGKI.config +++ b/arch/arm64/configs/vendor/holi_QGKI.config @@ -51,7 +51,7 @@ CONFIG_I2C_RTC6226_QCA=m CONFIG_SCSI_UFSHCD_QTI=y CONFIG_SCSI_UFS_BSG=y CONFIG_MSM_EXT_DISPLAY=y -# CONFIG_SCSI_UFSHCD is not set +CONFIG_SCSI_UFSHCD=y # CONFIG_RADIO_SI470X is not set # CONFIG_RADIO_SI4713 is not set # CONFIG_USB_MR800 is not set