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

Commit 5dcd3204 authored by Asutosh Das's avatar Asutosh Das
Browse files

scsi: ufshcd: Move to ufshcd core 



Hereon use upstream ufshcd core.

Change-Id: I814921a5a30f27cf6911e9a99c952790888f7e56
Signed-off-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
parent 8fa52ab6

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,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

drivers/scsi/ufs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ config SCSI_UFSHCD 


config SCSI_UFSHCD_QTI

	tristate "Universal Flash Storage Controller Driver Core QTI"

	depends on SCSI && SCSI_DMA && QGKI && !SCSI_UFSHCD

	depends on SCSI && SCSI_DMA && QGKI && SCSI_UFSHCD

	select PM_DEVFREQ

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select NLS
@@ -171,7 +171,7 @@ config SCSI_UFS_BSG 


config SCSI_UFS_CRYPTO

	bool "UFS Crypto Engine Support"

	depends on (SCSI_UFSHCD || SCSI_UFSHCD_QTI) && BLK_INLINE_ENCRYPTION

	depends on SCSI_UFSHCD && BLK_INLINE_ENCRYPTION

	help

	  Enable Crypto Engine Support in UFS.

	  Enabling this makes it possible for the kernel to use the crypto

drivers/scsi/ufs/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -11,9 +11,5 @@ obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o 
obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o

obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o

obj-$(CONFIG_SCSI_UFS_MEDIATEK) += ufs-mediatek.o

obj-$(CONFIG_SCSI_UFSHCD_QTI) += ufshcd-qti-core.o

ufshcd-qti-core-y		+= ufshcd-qti.o ufs-sysfs.o

ufshcd-qti-core-$(CONFIG_SCSI_UFS_BSG)	+= ufs_bsg.o

ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o

ufshcd-qti-core-$(CONFIG_SCSI_UFS_CRYPTO) += ufshcd-crypto.o

obj-$(CONFIG_SCSI_UFS_CRYPTO_QTI) += ufshcd-crypto-qti.o

drivers/scsi/ufs/ufshcd-qti.c

+2 −1
Original line number Diff line number Diff line
@@ -8214,7 +8214,8 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) 
	int ret;

	ktime_t start = ktime_get();



	dev_err(hba->dev, "*** This is %s ***\n", __FILE__);

	dev_err(hba->dev, "Using %s: Move to upstream ufs core --\n", __FILE__);

	return -EPERM;



	ret = ufshcd_link_startup(hba);

	if (ret)

drivers/scsi/ufs/ufshcd.c

+1 −0
Original line number Diff line number Diff line
@@ -7219,6 +7219,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool async) 
	int ret;

	ktime_t start = ktime_get();



	dev_err(hba->dev, "*** This is %s ***\n", __FILE__);

	ret = ufshcd_link_startup(hba);

	if (ret)

		goto out;