FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-03 15:52:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kevin Hilman 2011-07-18 16:24:17 -07:00
parent d5c128289f
commit 6a62b78d9a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/vc.c
View File

@ -152,8 +152,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm,
smps_delay = ((smps_steps * voltdm->pmic->step_size) / smps_delay = ((smps_steps * voltdm->pmic->step_size) /
voltdm->pmic->slew_rate) + 2; voltdm->pmic->slew_rate) + 2;
udelay(smps_delay); udelay(smps_delay);
voltdm->nominal_volt = target_volt;
} }
/* vc_bypass_scale - VC bypass method of voltage scaling */ /* vc_bypass_scale - VC bypass method of voltage scaling */

6
arch/arm/mach-omap2/voltage.c
View File

@ -85,7 +85,11 @@ int voltdm_scale(struct voltagedomain *voltdm,
return -ENODATA; return -ENODATA;
} }
return voltdm->scale(voltdm, target_volt); ret = voltdm->scale(voltdm, target_volt);
if (!ret)
voltdm->nominal_volt = target_volt;
return ret;
} }
/** /**