diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-07-19 01:24:17 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 21:09:22 +0200 |
| commit | 6a62b78d9aa6661cae1a7d30b574daf435a14c47 (patch) | |
| tree | 4812b637f223c71828a56ddd3261113024459a0e /arch/arm/mach-omap2 | |
| parent | OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage (diff) | |
| download | linux-6a62b78d9aa6661cae1a7d30b574daf435a14c47.tar.xz linux-6a62b78d9aa6661cae1a7d30b574daf435a14c47.zip | |
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')
| -rw-r--r-- | arch/arm/mach-omap2/vc.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/voltage.c | 6 |
2 files changed, 5 insertions, 3 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, 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 */ diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 441c2d98008c..64070ac1e761 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -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; } /** |