diff options
author | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-07-12 14:36:48 (GMT) |
commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /drivers/power/battery | |
parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
download | u-boot-fsl-qoriq-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/power/battery')
-rw-r--r-- | drivers/power/battery/bat_trats.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c index ca0d214..97a9661 100644 --- a/drivers/power/battery/bat_trats.c +++ b/drivers/power/battery/bat_trats.c @@ -41,18 +41,23 @@ static int power_battery_charge(struct pmic *bat) for (k = 0; bat->chrg->chrg_bat_present(p_bat->chrg) && bat->chrg->chrg_type(p_bat->muic) && battery->state_of_chrg < 100; k++) { - udelay(10000000); - puts("."); + udelay(2000000); + if (!(k % 5)) + puts("."); bat->fg->fg_battery_update(p_bat->fg, bat); - if (k == 100) { + if (k == 200) { debug(" %d [V]", battery->voltage_uV); puts("\n"); k = 0; } + if (ctrlc()) { + printf("\nCharging disabled on request.\n"); + goto exit; + } } - + exit: bat->chrg->chrg_state(p_bat->chrg, CHARGER_DISABLE, 0); return 0; |