Merge "scsi: ufs: Read device tree to find UFS's Vcc voltage level" (5d03d9c2) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/scsi/ufs/ufshcd-pltfrm.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -129,10 +129,11 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
		static int ufshcd_populate_vreg(struct device dev, const char name,
		struct ufs_vreg **out_vreg)
		{
		int ret = 0;
		int len, ret = 0;
		char prop_name[MAX_PROP_SIZE];
		struct ufs_vreg *vreg = NULL;
		struct device_node *np = dev->of_node;
		const __be32 *prop;

		if (!np) {
		dev_err(dev, "%s: non DT initialization\n", __func__);
		@@ -162,8 +163,16 @@ static int ufshcd_populate_vreg(struct device dev, const char name,
		vreg->min_uV = UFS_VREG_VCC_1P8_MIN_UV;
		vreg->max_uV = UFS_VREG_VCC_1P8_MAX_UV;
		} else {
		prop = of_get_property(np, "vcc-voltage-level", &len);
		if (!prop \|\| (len != (2 * sizeof(__be32)))) {
		dev_warn(dev, "%s vcc-voltage-level property.\n",
		prop ? "invalid format" : "no");
		vreg->min_uV = UFS_VREG_VCC_MIN_UV;
		vreg->max_uV = UFS_VREG_VCC_MAX_UV;
		} else {
		vreg->min_uV = be32_to_cpup(&prop[0]);
		vreg->max_uV = be32_to_cpup(&prop[1]);
		}
		}
		} else if (!strcmp(name, "vccq")) {
		vreg->min_uV = UFS_VREG_VCCQ_MIN_UV;