Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53c3d8d7 authored by Yaniv Gardi's avatar Yaniv Gardi Committed by David Keitel
Browse files

defconfig: change SCSI_UFS_MSM to SCSI_UFS_QCOM 



Since UFS is not used strictly in a specific set of targets but rather
its code is applicable to MSM, APQ, IPQ etc, "SCSI_UFS_MSM" should be
changed to "SCSI_UFS_QCOM".

Change-Id: I8851907f86055bb5012cb4a00f81511529ba4e03
Signed-off-by: default avatarYaniv Gardi <ygardi@codeaurora.org>
[gbroner@codeaurora.org: fix merge conflicts]
Signed-off-by: default avatarGilad Broner <gbroner@codeaurora.org>
[subhashj@codeaurora.org: resolved merge conflicts, dropped changes to
apq8084_defconfig & msm8994_defconfig files]
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
[venkatg@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
parent 8c9b78c1

drivers/scsi/ufs/Makefile

+3 −3
Original line number Diff line number Diff line 
# UFSHCD makefile

obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o

obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy.o

obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy-qmp-28nm.o

obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy-qmp-20nm.o

obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy.o

obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy-qmp-28nm.o

obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy-qmp-20nm.o

obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o ufs_quirks.o

obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o

obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o

drivers/scsi/ufs/ufshcd.h

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ int ufshcd_read_device_desc(struct ufs_hba *hba, u8 *buf, u32 size); 
int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf,

				u32 size, bool ascii);

/* variant specific ops structures */

#ifdef CONFIG_SCSI_UFS_MSM

#ifdef CONFIG_SCSI_UFS_QCOM

extern const struct ufs_hba_variant_ops ufs_hba_qcom_vops;

#else

static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {