On Fri, Nov 25, 2011 at 09:49, Tero Kristo <t-kristo@xxxxxx> wrote: > 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@xxxxxx> Acked-by: Nishanth Menon <nm@xxxxxx> Regards, Nishanth Menon > --- > 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 16cb6d4..ffb68d8 100644 > --- a/arch/arm/mach-omap2/vp.c > +++ b/arch/arm/mach-omap2/vp.c > @@ -53,8 +53,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->vp_vddmin); > - vddmax = voltdm->pmic->uv_to_vsel(voltdm->pmic->vp_vddmax); > + vddmin = max(voltdm->vp_param->vddmin, voltdm->pmic->vp_vddmin); > + vddmax = min(voltdm->vp_param->vddmax, voltdm->pmic->vp_vddmax); > + vddmin = voltdm->pmic->uv_to_vsel(vddmin); > + vddmax = voltdm->pmic->uv_to_vsel(vddmax); > > waittime = ((voltdm->pmic->step_size / voltdm->pmic->slew_rate) * > sys_clk_rate) / 1000; > -- > 1.7.4.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
