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

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

Merge "scsi: ufs: Configure Vccq/Vccq2 with supplied load in LPM"

parents d758903f ed17e563

drivers/scsi/ufs/ufshcd-pltfrm.c

+4 −1
Original line number Diff line number Diff line
@@ -195,7 +195,10 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, 
		goto out;

	}



	vreg->min_uA = 0;

	snprintf(prop_name, MAX_PROP_SIZE, "%s-min-microamp", name);

	if (of_property_read_u32(np, prop_name, &vreg->min_uA))

		vreg->min_uA = UFS_VREG_LPM_LOAD_UA;



	if (!strcmp(name, "vcc")) {

		if (of_property_read_bool(np, "vcc-supply-1p8")) {

			vreg->min_uV = UFS_VREG_VCC_1P8_MIN_UV;

drivers/scsi/ufs/ufshcd.c

+1 −2
Original line number Diff line number Diff line
@@ -9580,8 +9580,7 @@ static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba, 
	else if (vreg->unused)

		return 0;

	else

		return ufshcd_config_vreg_load(hba->dev, vreg,

					       UFS_VREG_LPM_LOAD_UA);

		return ufshcd_config_vreg_load(hba->dev, vreg, vreg->min_uA);

}



static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,