Merge branch 'buildman' of git://git.denx.de/u-boot-x86

[u-boot] / arch / arm / cpu / arm926ejs / mxs / spl_power_init.c

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
index 4275c5d0a69a588a41c52fb669f8e1746de72007..1c54ab7de3bfc3726b1c823e47500a462607b1a4 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -56,7 +56,7 @@ static void mxs_power_clock2pll(void)
  * This function ungates the RTC block and sets the AUTO_RESTART
  * bit to work around a design bug on MX28EVK Rev. A .
  */
- 
+
 static void mxs_power_set_auto_restart(void)
 {
        struct mxs_rtc_regs *rtc_regs =
@@ -654,6 +654,8 @@ static void mxs_batt_boot(void)
        clrsetbits_le32(&power_regs->hw_power_5vctrl,
                POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
                0x8 << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
+
+       mxs_power_enable_4p2();
 }
 
 /**
@@ -1000,7 +1002,8 @@ static void mxs_power_set_vddx(const struct mxs_vddx_cfg *cfg,
        uint32_t powered_by_linreg = 0;
        int adjust_up, tmp;
 
-       new_brownout = DIV_ROUND(new_target - new_brownout, cfg->step_mV);
+       new_brownout = DIV_ROUND_CLOSEST(new_target - new_brownout,
+                                        cfg->step_mV);
 
        cur_target = readl(cfg->reg);
        cur_target &= cfg->trg_mask;