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

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

Merge "clk: provider: cleanup of unused use_max_uV"

parents 2d30ac5c 6a207f4a

drivers/clk/clk.c

+3 −6
Original line number Diff line number Diff line
@@ -572,8 +572,7 @@ static int clk_update_vdd(struct clk_vdd_class *vdd_class) 
	for (i = 0; i < vdd_class->num_regulators; i++) {

		pr_debug("Set Voltage level Min %d, Max %d\n", uv[new_base + i],

				uv[max_lvl + i]);

		rc = regulator_set_voltage(r[i], uv[new_base + i],

			vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

		rc = regulator_set_voltage(r[i], uv[new_base + i], INT_MAX);

		if (rc)

			goto set_voltage_fail;
@@ -594,13 +593,11 @@ static int clk_update_vdd(struct clk_vdd_class *vdd_class) 
	return rc;



enable_disable_fail:

	regulator_set_voltage(r[i], uv[cur_base + i],

			vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

	regulator_set_voltage(r[i], uv[cur_base + i], INT_MAX);



set_voltage_fail:

	for (i--; i >= 0; i--) {

		regulator_set_voltage(r[i], uv[cur_base + i],

		       vdd_class->use_max_uV ? INT_MAX : uv[max_lvl + i]);

		regulator_set_voltage(r[i], uv[cur_base + i], INT_MAX);

		if (cur_lvl == 0 || cur_lvl == vdd_class->num_levels)

			regulator_disable(r[i]);

		else if (level == 0)

drivers/clk/qcom/camcc-sm8150.c

+0 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,6 @@ static int cam_cc_sm8150_probe(struct platform_device *pdev) 
				"Unable to get vdd_mm regulator\n");

		return PTR_ERR(vdd_mm.regulator[0]);

	}

	vdd_mm.use_max_uV = true;



	camcc_bus_id = msm_bus_scale_register_client(&clk_debugfs_scale_table);

	if (!camcc_bus_id) {

drivers/clk/qcom/dispcc-sm8150.c

+0 −1
Original line number Diff line number Diff line
@@ -1637,7 +1637,6 @@ static int disp_cc_sm8150_probe(struct platform_device *pdev) 
				"Unable to get vdd_mm regulator\n");

		return PTR_ERR(vdd_mm.regulator[0]);

	}

	vdd_mm.use_max_uV = true;



	dispcc_bus_id = msm_bus_scale_register_client(&clk_debugfs_scale_table);

	if (!dispcc_bus_id) {

drivers/clk/qcom/gcc-sm8150.c

+0 −1
Original line number Diff line number Diff line
@@ -4262,7 +4262,6 @@ static int gcc_sm8150_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Unable to get vdd_mm regulator\n");

		return PTR_ERR(vdd_mm.regulator[0]);

	}

	vdd_mm.use_max_uV = true;



	/* register hardware clocks */

	for (i = 0; i < ARRAY_SIZE(gcc_sm8150_hws); i++) {

drivers/clk/qcom/videocc-sm8150.c

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static int video_cc_sm8150_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Unable to get vdd_mm regulator\n");

		return PTR_ERR(vdd_mm.regulator[0]);

	}

	vdd_mm.use_max_uV = true;



	videocc_bus_id =

		msm_bus_scale_register_client(&clk_debugfs_scale_table);