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

Commit 99af2a09 authored by Anirudh Ghayal's avatar Anirudh Ghayal
Browse files

regulator: msm_gfx_ldo: Fix the CX voting logic 



Vote on the CX rail only if the gfx_ldo regulator
is enabled.

CRs-Fixed: 1078568
Change-Id: Ice3a527b9952c0fdee813d8ad152d4c1deea7ecd
Signed-off-by: default avatarAnirudh Ghayal <aghayal@codeaurora.org>
parent f762adc5

drivers/regulator/msm_gfx_ldo.c

+20 −11
Original line number Diff line number Diff line
@@ -398,6 +398,15 @@ static int msm_gfx_ldo_enable(struct regulator_dev *rdev) 
				ldo_vreg->corner + MIN_CORNER_OFFSET);



	if (ldo_vreg->vdd_cx) {

		rc = regulator_set_voltage(ldo_vreg->vdd_cx,

			ldo_vreg->vdd_cx_corner_map[ldo_vreg->corner],

			INT_MAX);

		if (rc) {

			pr_err("Unable to set CX for corner %d rc=%d\n",

				ldo_vreg->corner + MIN_CORNER_OFFSET, rc);

			goto fail;

		}



		rc = regulator_enable(ldo_vreg->vdd_cx);

		if (rc) {

			pr_err("regulator_enable: vdd_cx: failed rc=%d\n", rc);
@@ -646,17 +655,6 @@ static int msm_gfx_ldo_set_voltage(struct regulator_dev *rdev, 
	else if (corner < ldo_vreg->corner)

		dir = DOWN;



	if (ldo_vreg->vdd_cx) {

		rc = regulator_set_voltage(ldo_vreg->vdd_cx,

			ldo_vreg->vdd_cx_corner_map[corner],

			INT_MAX);

		if (rc) {

			pr_err("Unable to set CX for corner %d rc=%d\n",

					corner + MIN_CORNER_OFFSET, rc);

			goto done;

		}

	}



	if (ldo_vreg->mem_acc_vreg && dir == DOWN) {

		mem_acc_corner = ldo_vreg->mem_acc_corner_map[corner];

		rc = regulator_set_voltage(ldo_vreg->mem_acc_vreg,
@@ -668,6 +666,17 @@ static int msm_gfx_ldo_set_voltage(struct regulator_dev *rdev, 
		goto done;

	}



	if (ldo_vreg->vdd_cx) {

		rc = regulator_set_voltage(ldo_vreg->vdd_cx,

			ldo_vreg->vdd_cx_corner_map[corner],

			INT_MAX);

		if (rc) {

			pr_err("Unable to set CX for corner %d rc=%d\n",

					corner + MIN_CORNER_OFFSET, rc);

			goto done;

		}

	}



	new_mode = get_operating_mode(ldo_vreg, corner);



	if (new_mode == BHS) {