diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-04-06 01:55:22 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 21:09:21 +0200 |
| commit | 7590f608aacba64c42edd5a8d9560264b049f403 (patch) | |
| tree | 86f3fa5543538fb82bc73192ea5b7ff7d1194142 /arch/arm/mach-omap2/vc.c | |
| parent | OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix (diff) | |
| download | linux-7590f608aacba64c42edd5a8d9560264b049f403.tar.xz linux-7590f608aacba64c42edd5a8d9560264b049f403.zip | |
OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain
Track current nominal voltage as part of struct voltagedomain instead
of omap_vdd_info, which will soon be removed.
Also renames field from curr_volt to nominal_volt.
No functional changes.
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.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index f8bdd5183e2f..d9e69944f0c9 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -128,7 +128,7 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm, } *target_vsel = voltdm->pmic->uv_to_vsel(target_volt); - *current_vsel = voltdm->pmic->uv_to_vsel(vdd->curr_volt); + *current_vsel = voltdm->pmic->uv_to_vsel(voltdm->nominal_volt); /* Setting the ON voltage to the new target voltage */ vc_cmdval = voltdm->read(vc->cmdval_reg); @@ -145,7 +145,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, unsigned long target_volt, u8 target_vsel, u8 current_vsel) { - struct omap_vdd_info *vdd = voltdm->vdd; u32 smps_steps = 0, smps_delay = 0; smps_steps = abs(target_vsel - current_vsel); @@ -154,7 +153,7 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, voltdm->pmic->slew_rate) + 2; udelay(smps_delay); - vdd->curr_volt = target_volt; + voltdm->nominal_volt = target_volt; } /* vc_bypass_scale - VC bypass method of voltage scaling */ |