linux/drivers/power
Linus Torvalds e665faa424 1. New drivers:
- Marvell 88pm860x charger and battery drivers;
    - Texas Instruments LP8788 charger driver;
 2. Two new power supply properties: whether a battery is authentic, and
    chargers' maximal currents and voltages;
 3. A lot of TI LP8727 Charger cleanups;
 4. New features for Charger Manager, mainly now we can disable specific
    regulators;
 5. Random fixes and cleanups for other drivers.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQbjMFAAoJEGgI9fZJve1bR6gP/2Ri0etCU5zQMmbsFv5wxwHT
 BNgqFYoLmtxAJm7afM/9Qo2GxSam/Gi6vW6jfYxVOEDt9hJ5zaaJBxM4XmKEBShR
 PYlV9u45jGUCIHJXoi8DTND9Swz0VfVve9UtK5fVdXr73fYFemP8U86alI1MBL5Q
 8U3F0V8rObjGKWZrzN4BreB8bfbZYQCUafpoGS1ids3Uwm38d4tDb/jx8guSV24D
 LEhXy9unV9NdPExRn1FWFAgqjtgnnBv5SmpCBd6VwKNmpOgVB+H0CjOaOPzMgd+0
 X6dpJQtbjGZOhHhkcAoWsXYgxS8WMtTqlSjHSgswJJ/fdjv8YJoT7ncyu5wItY1x
 cN5NRBKVpnHv+fkQDE4xVWzEOH68lK8RoGksay0gvTJj3MQWwOpOANGHbsnMG6rj
 GBzQ7pyMbDTK7n1oynvmSskF4BdvYHM+Ns7vPUOAzoduKrOnhPVDpk3rLSFZxQNO
 RoqXbnNYqg4qROB9z8Drs95WD59fKjNTlfFr1moR2sr4wncEJiFduMz4dCOs7nq7
 ahZxd95a2Bb6LbcN244+loGBXmx6KD6BurrDc3yTM3hl+oVx+MecVv9uoKvKlz4y
 YPh9XrdCSfj9Ms7TOqW8XPDl/ZREswaCIer7x8XsL+K42fYkPKlrO3OUMHIbh+3e
 rfkFPAR55bLcmtiaahp3
 =LkdH
 -----END PGP SIGNATURE-----

Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6

Pull battery updates from Anton Vorontsov:
 "1. New drivers:
     - Marvell 88pm860x charger and battery drivers;
     - Texas Instruments LP8788 charger driver;
  2. Two new power supply properties: whether a battery is authentic,
     and chargers' maximal currents and voltages;
  3. A lot of TI LP8727 Charger cleanups;
  4. New features for Charger Manager, mainly now we can disable
     specific regulators;
  5. Random fixes and cleanups for other drivers."

Fix up trivial conflicts in <linux/mfd/88pm860x.h>

* tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
  pda_power: Remove ac_draw_failed goto and label
  charger-manager: Add support sysfs entry for charger
  charger-manager: Support limit of maximum possible
  charger-manager: Check fully charged state of battery periodically
  lp8727_charger: More pure cosmetic improvements
  lp8727_charger: Fix checkpatch warning
  lp8727_charger: Add description in the private data
  lp8727_charger: Fix a typo - chg_parm to chg_param
  lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
  lp8727_charger: Clean up lp8727_charger_changed()
  lp8727_charger: Return if the battery is discharging
  lp8727_charger: Make lp8727_charger_get_propery() simpler
  lp8727_charger: Make lp8727_ctrl_switch() inline
  lp8727_charger: Make lp8727_init_device() shorter
  lp8727_charger: Clean up lp8727_is_charger_attached()
  lp8727_charger: Use specific definition
  lp8727_charger: Clean up lp8727 definitions
  lp8727_charger: Use the definition rather than enum
  lp8727_charger: Fix code for getting battery temp
  lp8727_charger: Clear interrrupts at inital time
  ...
2012-10-07 17:29:24 +09:00
..
avs ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ 2012-09-12 18:06:30 -07:00
88pm860x_battery.c 88pm860x_battery and charger: Fix a few post-merge issues 2012-09-20 15:33:12 -07:00
88pm860x_charger.c 88pm860x_battery and charger: Fix a few post-merge issues 2012-09-20 15:33:12 -07:00
ab8500_btemp.c 1. New drivers: 2012-10-07 17:29:24 +09:00
ab8500_charger.c 1. New drivers: 2012-10-07 17:29:24 +09:00
ab8500_fg.c 1. New drivers: 2012-10-07 17:29:24 +09:00
abx500_chargalg.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
apm_power.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
bq27x00_battery.c bq27x00_battery: Fix error return code 2012-08-22 18:48:13 -07:00
charger-manager.c 1. New drivers: 2012-10-07 17:29:24 +09:00
collie_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
da9030_battery.c da9030_battery: Don't use 0 as NULL 2012-08-22 20:00:45 -07:00
da9052-battery.c da9052-battery: Don't free IRQ that wasn't requested 2012-09-20 15:00:12 -07:00
ds2760_battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
ds2780_battery.c W1: split master mutex to avoid deadlocks. 2012-06-13 16:38:40 -07:00
ds2781_battery.c ds2781_battery: Replace call to kzalloc with devm_kzalloc 2012-08-22 19:47:14 -07:00
ds2782_battery.c power_supply: Convert i2c drivers to module_i2c_driver 2012-03-26 20:41:22 +04:00
generic-adc-battery.c power: battery: Generic battery driver using IIO 2012-09-22 10:40:23 +01:00
gpio-charger.c gpio-charger: Use cansleep version of gpio_set_value 2012-06-19 20:48:37 -07:00
intel_mid_battery.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
isp1704_charger.c usb: phy: fix return value check of usb_get_phy 2012-07-02 10:40:49 +03:00
jz4740-battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
Kconfig 1. New drivers: 2012-10-07 17:29:24 +09:00
lp8727_charger.c lp8727_charger: More pure cosmetic improvements 2012-09-20 18:07:23 -07:00
lp8788-charger.c power_supply: Add new lp8788 charger driver 2012-09-20 15:11:54 -07:00
Makefile 1. New drivers: 2012-10-07 17:29:24 +09:00
max8903_charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8925_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
max8997_charger.c max8997_charger: Remove duplicate module.h 2012-01-06 04:59:25 +04:00
max8998_charger.c Revert "max8998_charger: Include linux/module.h just once" 2012-03-26 20:41:27 +04:00
max17040_battery.c workqueue: make deferrable delayed_work initializer names consistent 2012-08-21 13:18:23 -07:00
max17042_battery.c max17042_battery: Support CHARGE_COUNTER power supply attribute 2012-06-19 16:48:08 -07:00
olpc_battery.c Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc 2012-08-02 11:52:39 -07:00
pcf50633-charger.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
pda_power.c pda_power: Remove ac_draw_failed goto and label 2012-09-21 16:50:11 -07:00
pmu_battery.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
power_supply_core.c Merge with upstream to accommodate with thermal changes 2012-07-31 05:16:47 -07:00
power_supply_leds.c device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
power_supply_sysfs.c power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX 2012-08-22 21:59:15 -07:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
s3c_adc_battery.c s3c_adc_battery: Average over more than one adc sample 2012-01-06 06:13:35 +04:00
sbs-battery.c sbs-battery: Probe should try talking to the device 2012-09-20 14:57:52 -07:00
smb347-charger.c smb347-charger: Fix battery status reporting logic for charger faults 2012-09-20 14:44:45 -07:00
test_power.c test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties 2012-06-20 22:45:41 -07:00
tosa_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
twl4030_charger.c twl4030_charger: Use IRQF_ONESHOT 2012-09-20 15:41:49 -07:00
wm97xx_battery.c 1. New drivers: 2012-10-07 17:29:24 +09:00
wm831x_backup.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
wm831x_power.c mfd: Convert wm831x to irq_domain 2012-05-20 17:27:07 +02:00
wm8350_power.c power_supply: Convert drivers/power/* to use module_platform_driver() 2012-01-04 09:12:07 +04:00
z2_battery.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00