ARM: OMAP3+: vp: use new vp_params for calculating vddmin and vddmax

Now we select the vddmin and vddmax values based on both pmic and
voltage processor data, this allows usage of different power ICs.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c
index c7e0507bfbd339afad198e81da1850f206c204a4..394a253c4cd4dbf54c5c31229c48dcb4abb6cefc 100644 (file)
--- 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->uv_to_vsel(voltdm->pmic->vddmin);
-       vddmax = voltdm->pmic->uv_to_vsel(voltdm->pmic->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);