aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2011-07-18 19:24:17 -0400
committerKevin Hilman <khilman@ti.com>2011-09-15 15:09:22 -0400
commit6a62b78d9aa6661cae1a7d30b574daf435a14c47 (patch)
tree4812b637f223c71828a56ddd3261113024459a0e /arch/arm/mach-omap2/vc.c
parentd5c128289f5066a7c6bf27d6ba27a6ae425be757 (diff)
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: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r--arch/arm/mach-omap2/vc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index d9e69944f0c9..6e586767a904 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -152,8 +152,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm,
152 smps_delay = ((smps_steps * voltdm->pmic->step_size) / 152 smps_delay = ((smps_steps * voltdm->pmic->step_size) /
153 voltdm->pmic->slew_rate) + 2; 153 voltdm->pmic->slew_rate) + 2;
154 udelay(smps_delay); 154 udelay(smps_delay);
155
156 voltdm->nominal_volt = target_volt;
157} 155}
158 156
159/* vc_bypass_scale - VC bypass method of voltage scaling */ 157/* vc_bypass_scale - VC bypass method of voltage scaling */