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

Commit 6a62b78d authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale 



Currently, the nominal voltage is updated in the VC post-scale function
which is common to both scaling methods.  However, this has readabiliy
problems as this update is not where it might be expected.  Instead, move
the updated into voltdm_scale() upon a successful return of voltdm->scale()

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent d5c12828

arch/arm/mach-omap2/vc.c

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, 
	smps_delay = ((smps_steps * voltdm->pmic->step_size) /

			voltdm->pmic->slew_rate) + 2;

	udelay(smps_delay);



	voltdm->nominal_volt = target_volt;

}



/* vc_bypass_scale - VC bypass method of voltage scaling */

arch/arm/mach-omap2/voltage.c

+5 −1
Original line number Diff line number Diff line
@@ -85,7 +85,11 @@ int voltdm_scale(struct voltagedomain *voltdm, 
		return -ENODATA;

	}



	return voltdm->scale(voltdm, target_volt);

	ret = voltdm->scale(voltdm, target_volt);

	if (!ret)

		voltdm->nominal_volt = target_volt;



	return ret;

}



/**