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

Commit 011bd31c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: change SCSI_UFS_MSM to SCSI_UFS_QCOM"

parents 4ececa58 6662d790

arch/arm/configs/apq8084-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ CONFIG_SCSI_LOGGING=y 
CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_TEST=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_MSM=y

arch/arm/configs/apq8084_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ CONFIG_SCSI_LOGGING=y 
CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_TEST=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_MSM=y

arch/arm64/configs/msm8994-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ CONFIG_SCSI_LOGGING=y 
CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

arch/arm64/configs/msm8994_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ CONFIG_SCSI_LOGGING=y 
CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_MSM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

drivers/scsi/ufs/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -71,16 +71,16 @@ config SCSI_UFSHCD_PLATFORM 


	  If unsure, say N.



config SCSI_UFS_MSM

	bool "MSM specific hooks to UFS controller platform driver"

config SCSI_UFS_QCOM

	bool "QCOM specific hooks to UFS controller platform driver"

	depends on SCSI_UFSHCD_PLATFORM && ARCH_MSM

	help

	  This selects the MSM specific additions to UFSHCD platform driver.

	  UFS host on MSM needs some vendor specific configuration before

	  This selects the QCOM specific additions to UFSHCD platform driver.

	  UFS host on QCOM needs some vendor specific configuration before

	  accessing the hardware which includes PHY configuration and vendor

	  specific registers.



	  Select this if you have UFS controller on MSM chipset.

	  Select this if you have UFS controller on QCOM chipset.

	  If unsure, say N.



config SCSI_UFS_TEST