snowball/igloo-kernel.git/drivers/power, branch android-2012.04

Merge remote-tracking branch 'jstultz/linaro-android-3.3' into integration-android-ux500

2012-03-19T15:30:14+00:00

Conflicts: arch/arm/common/Makefile drivers/gpu/Makefile drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/card/block.c drivers/mmc/core/core.c drivers/video/Kconfig include/net/bluetooth/hci.h include/net/bluetooth/hci_core.h include/net/bluetooth/sco.h kernel/printk.c net/bluetooth/hci_conn.c net/bluetooth/hci_event.c net/bluetooth/l2cap_core.c net/bluetooth/mgmt.c net/bluetooth/sco.c

Add support for the 9100 Li-ION battery and adjust the bkup battery charger parameters

2012-03-19T07:51:14+00:00

Signed-off-by: Gregory Hermant

power: ab8500_charger autopower bug-fix

2012-03-19T07:51:14+00:00

When the charger is removed the autopower feature is turned off by clearing a bit in one of the registers ST-Ericsson Linux next: NA ST-Ericsson ID: ER405539 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic61f355eed2c77c327d0e73f92a2ef22337f6f38 Signed-off-by: Johan Bjornstedt Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43337 Reviewed-by: QABUILD Reviewed-by: Peter ENDERBORG Reviewed-by: Jonas ABERG Reviewed-by: Karl KOMIEROWSKI

power: ab5500-fg: optimize delays during probe

2012-03-19T07:51:13+00:00

Optimize delays during fg psy registration by powering up fuel gauge before registration and scheduling periodic workqueues at 250msec so that enough samples are available for conversion. ST-Ericsson Linux next: NA ST-Ericsson ID: 373975 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iff0ec497a90399d0dcc514df24b12d594eb06459 Signed-off-by: Rajagopala V Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/44315 Reviewed-by: QABUILD Reviewed-by: Srinidhi KASAGAR

ab8500_btemp: limit number of batctrl readings

2012-03-19T07:51:12+00:00

Read as many batctrl values as possible during 250 ms but do not spend more time than that. This is done with cc_lock taken (the ab8500_fg_inst_curr_start call in the ab8500_fg driver) so finishing as quick as possible is good (lock freed by the ab8500_fg_inst_curr_finalize call). ST-Ericsson Linux next: - ST-Ericsson ID: 404432 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ieee4c01a6e1750a747abceaec60e3e4dd62419f0 Signed-off-by: Karl-Johan Perntz Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43177 Reviewed-by: Johan BJORNSTEDT Reviewed-by: QABUILD Reviewed-by: Jonas ABERG

power:ab8500_charger autopower settings

2012-03-19T07:51:12+00:00

Change the power loss handling so we do a reboot instead of poweroff when charger is connected. ST-Ericsson Linux next: NA ST-Ericsson ID: 373445 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Idfafba3f359829b87a0725d89cf86a72652dc1be Signed-off-by: pender01 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40696 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Johan BJORNSTEDT

power: ab8500_fg: Bug in instant current functions

2012-03-19T07:51:12+00:00

The FG turn of check bit was never reset to zero after use which forced the FG to be turned off and stopping the whole FG state machine. ST-Ericsson Linux next: - ST-Ericsson ID: 402157 ST-Ericsson FOSS-OUT ID Trivial Change-Id: I49232ff56245b887827428211256a19499a15a92 Signed-off-by: Kalle Komierowski Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42141

power: ab8500_bm: Temperature vs battery internal resistance table

2012-03-19T07:51:11+00:00

This patch adds the functionallity of being able to use a different internal battery resistance depending on the battery packs temperature. ST-Ericsson Linux next: NA ST-Ericsson ID: 400643 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5ce103418738616a0641aba3f2126db6c56e535c Signed-off-by: Kalle Komierowski Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41640 Reviewed-by: Hakan BERG Reviewed-by: Johan BJORNSTEDT

power: ab8500_bm: Report actual capacity during boot

2012-03-19T07:51:11+00:00

Previously we reported 100% capacity until the battery was identified. Since the driver that identifies the battery starts after the fuel gauge driver, we reported 100% for some time even though we had a calculated capacity ready ST-Ericsson ID: 374234 ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5b2b4057ffcf4a8b686c28f0272132d5d84c3c6d Signed-off-by: Johan Bjornstedt Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41827 Reviewed-by: Karl KOMIEROWSKI Tested-by: Karl KOMIEROWSKI

ab5500_bm: Add interface to reinit FG algorithm

2012-03-19T07:51:11+00:00

A function has been added to enable reinitialisation of the fuel gauge algorithm. This can be used to to reinitialise with a different battery voltage at start-up, for verification reasons. ST-Ericsson Linux next: NA ST-Ericsson ID: 357480 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I80d6e770a57affbe7f3af0fdf82052ca1b7fe8b4 Signed-off-by: Arun Murthy Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/40903 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Srinidhi KASAGAR