linux/drivers/power, branch v2.6.32

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-22T23:49:27Z

Conflicts: drivers/power/wm97xx_battery.c

power_supply: Add driver for the PMU on WM831x PMICs

2009-09-04T17:02:32Z

The WM831x PMICs provide power path management from three sources: a wall supply, USB and a battery with integrated charger. They also provide an additional backup supply with integrated for maintaining always on functionality such as the RTC and monitoring of power switches. After some initial configuration at startup the device operates autonomously, the driver simply provides reporting of the current state. Signed-off-by: Mark Brown Signed-off-by: Anton Vorontsov

ds2760_battery: Fix integer overflow for time_to_empty_now

2009-09-04T16:26:40Z

On the device we're currently developing, battery sizes of ~2.8Ah and current flow of ~600mA are typical. With that values, the life_sec computation overflows due to the multiplication by 3600. Signed-off-by: Daniel Mack Cc: Szabolcs Gyurko Cc: Matt Reimer Signed-off-by: Anton Vorontsov

wm97xx_battery: Convert to dev_pm_ops

2009-09-04T16:21:08Z

Signed-off-by: Marek Vasut Signed-off-by: Anton Vorontsov

wm97xx_battery: Use irq to detect charger state

2009-09-04T16:21:08Z

Signed-off-by: Marek Vasut Signed-off-by: Anton Vorontsov

wm97xx_battery: Use platform_data

2009-09-04T16:20:58Z

This patch converts the wm97xx-battery driver to use platform_data supplied by ac97 bus. Signed-off-by: Marek Vasut Signed-off-by: Anton Vorontsov

Merge git://git.infradead.org/users/cbou/battery-2.6.31

2009-07-30T23:45:53Z

* git://git.infradead.org/users/cbou/battery-2.6.31: Add ds2782 battery gas gauge driver olpc_battery: Ensure that the TRICKLE bit is checked olpc_battery: Fix up eeprom read function

ds2760_battery: implement set_charged() feature

2009-07-30T13:49:16Z

The ds2760's internal current meter is not reliable enough as it has an inacurracy of around ~15%. Without any correction for that error, the current accumulator is couting up all the time, even though the battery is already fully charged and hence destroys the static information. The longer it is connected, the worse is the aberration. Fortunately, this can be corrected by the DS2760_CURRENT_OFFSET_BIAS register. Using the external power_supply_set_battery_charged() function, this register is now gauging the measurement. A delayed work is used to debounce flaky GPIO signals and to let the current value settle. Also see Maxim's application note AN4188. Signed-off-by: Daniel Mack Cc: Szabolcs Gyurko Cc: Matt Reimer Cc: Anton Vorontsov Signed-off-by: Anton Vorontsov

power_supply: get_by_name and set_charged functionality

2009-07-30T13:49:15Z

This adds a function that indicates that a battery is fully charged. It also includes functions to get a power_supply device from the class of registered devices by name reference. These can be used to find a specific battery to call power_supply_set_battery_charged() on. Some battery drivers might need this information to calibrate themselves. Signed-off-by: Daniel Mack Cc: Ian Molton Cc: Anton Vorontsov Cc: Matt Reimer Signed-off-by: Anton Vorontsov

power_supply: EXPORT_SYMBOL cleanups

2009-07-30T13:49:00Z

While I'm at it, cleanup the power supply code so that EXPORT_SYMBOL_GPL appears directly after the symbole declaration. checkpatch.pl wants it that way. Signed-off-by: Daniel Mack Cc: Ian Molton Cc: Matt Reimer Signed-off-by: Anton Vorontsov