diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-06 17:06:37 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-06 17:06:37 -0800 |
| commit | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (patch) | |
| tree | d44b14736a46cd0d4270460fd6590a6d07c40730 /arch/arm/mach-omap2/vp.c | |
| parent | b197adabbd2f71c966b4bd89cca5a54a2def03e2 (diff) | |
| parent | df7cded30ced539d3b4e6bae9f3011d98c069d41 (diff) | |
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm
OMAP voltage layer updates towards supporting auto-retention/auto-off
Diffstat (limited to 'arch/arm/mach-omap2/vp.c')
| -rw-r--r-- | arch/arm/mach-omap2/vp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c index 6e9fe857431..a3c30655aa3 100644 --- a/arch/arm/mach-omap2/vp.c +++ b/arch/arm/mach-omap2/vp.c @@ -58,8 +58,10 @@ void __init omap_vp_init(struct voltagedomain *voltdm) sys_clk_rate = voltdm->sys_clk.rate / 1000; timeout = (sys_clk_rate * voltdm->pmic->vp_timeout_us) / 1000; - vddmin = voltdm->pmic->vp_vddmin; - vddmax = voltdm->pmic->vp_vddmax; + vddmin = max(voltdm->vp_param->vddmin, voltdm->pmic->vddmin); + vddmax = min(voltdm->vp_param->vddmax, voltdm->pmic->vddmax); + vddmin = voltdm->pmic->uv_to_vsel(vddmin); + vddmax = voltdm->pmic->uv_to_vsel(vddmax); waittime = DIV_ROUND_UP(voltdm->pmic->step_size * sys_clk_rate, 1000 * voltdm->pmic->slew_rate); |