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

Commit 95d17c2e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufshcd: Properly set the device Icc Level"

parents 8119c341 ac11399e

drivers/scsi/ufs/ufshcd-qti.c

+3 −1
Original line number Diff line number Diff line
@@ -7614,7 +7614,9 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, 
	 * vendors don't use this rail for embedded UFS devices as well. So

	 * it is normal that VCCQ rail may not be provided for given platform.

	 */

	if (!hba->vreg_info.vcc || !hba->vreg_info.vccq2) {

	if (!hba->vreg_info.vcc ||

		(!hba->vreg_info.vccq && hba->dev_info.wspecversion >= 0x300) ||

		(!hba->vreg_info.vccq2 && hba->dev_info.wspecversion < 0x300)) {

		dev_err(hba->dev, "%s: Regulator capability was not set, bActiveICCLevel=%d\n",

			__func__, icc_level);

		goto out;

drivers/scsi/ufs/ufshcd.c

+3 −2
Original line number Diff line number Diff line
@@ -6881,8 +6881,9 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, 
{

	u32 icc_level = 0;



	if (!hba->vreg_info.vcc || !hba->vreg_info.vccq ||

						!hba->vreg_info.vccq2) {

	if (!hba->vreg_info.vcc ||

		(!hba->vreg_info.vccq && hba->dev_info.wspecversion >= 0x300) ||

		(!hba->vreg_info.vccq2 && hba->dev_info.wspecversion < 0x300)) {

		dev_err(hba->dev,

			"%s: Regulator capability was not set, actvIccLevel=%d",

							__func__, icc_level);