linux/drivers/power, branch v3.0.62

drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal

2011-11-11T17:36:32Z

commit 0e053fcbbbc4d945247cb32cad2767b483cb65f8 upstream. Fixes the deadlock when inserting and removing the ds2780. Signed-off-by: Clifton Barnes Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman

drivers/power/ds2780_battery.c: create central point for calling w1 interface

2011-11-11T17:36:32Z

commit 853eee72f74f449797f0500ea19fc1bf497428d8 upstream. Simply creates one point to call the w1 interface. Signed-off-by: Clifton Barnes Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman

Merge git://git.infradead.org/battery-2.6

2011-05-27T17:12:35Z

* git://git.infradead.org/battery-2.6: PXA: Use dev_pm_ops in z2_battery ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery ds2760_battery: Fix indexing of the 4 active full EEPROM registers power: Make test_power driver more dynamic. bq27x00_battery: Name of cycle count property max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build) ARM: RX-51: Enable isp1704 power on/off isp1704_charger: Allow board specific powering routine gpio-charger: Add gpio_charger_resume power_supply: Add driver for MAX8903 charger

w1: add Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC support

2011-05-27T00:12:38Z

Add support for the Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC. It was suggested to combine this functionality with the current ds2782 driver. Unfortunately, I'm unable to commit the time to refactoring this driver to that extent and I don't have a platform with the ds2782 part to validate that there are no regression issues by adding this functionality. [akpm@linux-foundation.org: use min_t()] Signed-off-by: Clifton Barnes Tested-by: Haojian Zhuang Cc: Evgeniy Polyakov Cc: Ryan Mallon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

power_supply: Use max8925 platform_data from cell

2011-05-26T17:45:32Z

Avoid to get platform_data from parent device. Get it from mfd cell device instead. Signed-off-by: Haojian Zhuang Acked-by: Anton Vorontsov Cc: David Woodhouse Signed-off-by: Samuel Ortiz

PXA: Use dev_pm_ops in z2_battery

2011-05-20T15:25:11Z

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

ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery

2011-05-20T15:25:10Z

Fix rated capacity of the HP iPAQ hx4700 3.7V 1800mAh (359113-001) battery. For this battery the value of the rated capacity EEPROM register at 0x32 is 7; thus rated_capacities[7] = 1800. Signed-off-by: Paul Parsons Signed-off-by: Anton Vorontsov

ds2760_battery: Fix indexing of the 4 active full EEPROM registers

2011-05-20T15:25:09Z

Fix indexing of the 4 active full EEPROM registers. The indexing was out by 1, accessing the EEPROM registers at 0x23 to 0x26 instead of 0x22 to 0x25. Signed-off-by: Paul Parsons Signed-off-by: Anton Vorontsov

power: Make test_power driver more dynamic.

2011-05-20T15:25:08Z

In 2008 Masashi YOKOTA created the virtual battery driver found here: http://downloads.pylone.jp/src/virtual_battery/virtual_battery-0.0.1.tar.bz2 It found use out of tree, but was never merged upstream. Since then the test_power driver has been merged, which provides very similar functionality. This patch extends the test_power driver to be more dynamic at runtime, by merging portions of the Virtual Battery Driver by Masashi YOKOTA. With this patch, I can tweak the values in: /sys/module/test_power/parameters/* and watch the behavior of the gnome power managment daemon or other battery UI software. CC: Anton Vorontsov CC: Akihiro MAEDA CC: Masashi YOKOTA Signed-off-by: John Stultz Signed-off-by: Anton Vorontsov

bq27x00_battery: Name of cycle count property

2011-05-20T15:25:05Z

This patch fix using correct property POWER_SUPPLY_PROP_CYCLE_COUNT for cycle count instead POWER_SUPPLY_PROP_CHARGE_COUNTER Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Anton Vorontsov