linux/drivers/power
Linus Torvalds 5a1203914a - Four new drivers:
o goldfish_battery:
     This is Android Emulator battery driver. Originally from Google, but
     Intel folks reshaped it for mainline;
 
   o pm2301_charger:
     A new driver for ST-Ericsson 2301 Power Management chip, uses AB8500
     battery management core;
 
   o qnap-poweroff:
     The driver adds poweroff functionality for QNAP NAS boxes;
 
   o restart-poweroff:
     A generic driver that implements 'power off by restarting'. The actual
     poweroff functionality is implemented through a bootloader, so Linux'
     task is just to restart the box. The driver is useful on Buffalo
     Linkstation LS-XHL and LS-CHLv2 boards. Andrew Lunn worked on
     submitting the driver (as well as qnap-poweroff above).
 
 - A lot of fixes for ab8500 drivers. This is a part of efforts of syncing
   internal ST-Ericsson development tree with the mainline. Lee Jones @
   Linaro worked on compilation and reshaping these series;
 
 - New health properties for the power supplies: "Watchdog timer expire"
   and "Safety timer expire";
 
 - As usual, a bunch of fixes/cleanups here and there.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJRIww1AAoJEGgI9fZJve1bJ7sP/1hR8SYQZ/k0ayxA/kIxNEDA
 Qa2sAcdP5pa4F/A2Wi5MTrckSHuLlRRigWRCPM09emVOvt6g2MdM3Eq6ShuYb2p0
 g2bX0F9KBEa9gdiJC1wNVe9DilXbrJsk86V5E+ZkuVnNzM3S1FA1sPWGhdH66YVq
 9IKxm2XntyXFpuvhSYE01KQoFY+Crv1NEGXoIR7tB6Q1KOf3XswnsFwdKJ95IO5r
 8f/lVYRAYUfeplhrYd3eJTtb/GHhK7CutFV/E6kWlumGCWNVH2xt+dTlAmTUdQvO
 jKe9R5iq5eXFTQmN8QZDH7QdXO1DdmJZ9F112hIAud/93bmNrnc0WqMKM7CFHkfH
 S6ptGgeIdpGEM1KMgzKTNrQeNIYsVNtqbEiIiodR8S4e0cX2pb2n5IfzmELIVc0n
 QMZylORpGaH1lBxTE2RoT4raGeWF5jH0t0b0YRqccRPvQ4VjCJslDOq9IOETUe+/
 YxWpELJigW7FGLMfx0SB2/3s1P4EUaufWvHANCVaPuBsOZga854R4dzms4hKyKsL
 JQg+OKp/Bt78yAj/8/n0FWdxgldp/NjF4485ITQ1eOZyg8VSeIp93Lk6lgSTukux
 R1xLruxfPgdynpmYFCGF99JG2G8RmRuJFSTf8JttvyztkAxQw6zBtdmdiPk38wst
 qpUxdPpNDIvt65Ix7x+D
 =955B
 -----END PGP SIGNATURE-----

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

Pull battery updates from Anton Vorontsov:
 "Four new drivers:

   - goldfish_battery:

     This is Android Emulator battery driver.  Originally from Google,
     but Intel folks reshaped it for mainline

   - pm2301_charger:

     A new driver for ST-Ericsson 2301 Power Management chip, uses
     AB8500 battery management core

   - qnap-poweroff:

     The driver adds poweroff functionality for QNAP NAS boxes

   - restart-poweroff:

     A generic driver that implements 'power off by restarting'.  The
     actual poweroff functionality is implemented through a bootloader,
     so Linux' task is just to restart the box.  The driver is useful on
     Buffalo Linkstation LS-XHL and LS-CHLv2 boards.  Andrew Lunn worked
     on submitting the driver (as well as qnap-poweroff above).

  Additionally:

   - A lot of fixes for ab8500 drivers.  This is a part of efforts of
     syncing internal ST-Ericsson development tree with the mainline.
     Lee Jones @ Linaro worked on compilation and reshaping these
     series.

   - New health properties for the power supplies: "Watchdog timer
     expire" and "Safety timer expire"

   - As usual, a bunch of fixes/cleanups here and there"

* tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
  bq2415x_charger: Add support for offline and 100mA mode
  generic-adc-battery: Fix forever loop in gab_remove()
  goldfish_battery: Add missing GENERIC_HARDIRQS dependency
  da9030_battery: Include notifier.h
  bq27x00_battery: Fix reporting battery temperature
  power/reset: Remove newly introduced __dev* annotations
  lp8727_charger: Small cleanup in naming
  ab8500_btemp: Demote initcall sequence
  ds2782_battery: Add power_supply_changed() calls for proper uevent support
  power: Add battery driver for goldfish emulator
  u8500-charger: Delay for USB enumeration
  ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
  ab8500-charger: Do not touch VBUSOVV bits
  ab8500-fg: Use correct battery charge full design
  pm2301: LPN mode control support
  pm2301: Enable vbat low monitoring
  ab8500-bm: Flush all work queues before suspending
  ab8500-fg: Go to INIT_RECOVERY when charger removed
  ab8500-charger: Add support for autopower on AB8505 and AB9540
  abx500-chargalg: Add new sysfs interface to get current charge status
  ...

Fix up fairly straightforward conflicts in the ab8500 driver.  But since
it seems to be ARM-specific, I can't even compile-test the result..
2013-02-20 10:19:07 -08:00
..
avs ARM: OMAP2+: Drop plat/cpu.h for omap2plus 2012-12-17 10:50:41 -08:00
reset - Four new drivers: 2013-02-20 10:19:07 -08:00
88pm860x_battery.c 88pm860x_battery: Eliminate possible references to released resources 2013-01-06 12:46:23 -08:00
88pm860x_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ab8500_bmdata.c - Four new drivers: 2013-02-20 10:19:07 -08:00
ab8500_btemp.c Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 2013-02-02 19:29:13 -08:00
ab8500_charger.c u8500-charger: Delay for USB enumeration 2013-01-23 14:39:22 +00:00
ab8500_fg.c ab8500-fg: Use correct battery charge full design 2013-01-23 14:39:20 +00:00
abx500_chargalg.c abx500-chargalg: Add new sysfs interface to get current charge status 2013-01-23 14:39:16 +00: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 reporting battery temperature 2013-02-02 19:44:08 -08:00
bq2415x_charger.c bq2415x_charger: Add support for offline and 100mA mode 2013-02-16 13:34:10 -08:00
charger-manager.c charger_manager: Don't use [delayed_]work_pending() 2013-01-05 14:03:26 -08:00
collie_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
da9030_battery.c da9030_battery: Include notifier.h 2013-02-08 17:28:35 -08:00
da9052-battery.c da9052-battery: Avoid out-of-range array access 2013-01-06 14:34:26 -08:00
ds2760_battery.c workqueue: use mod_delayed_work() instead of cancel + queue 2012-08-13 16:27:37 -07:00
ds2780_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2781_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
ds2782_battery.c ds2782_battery: Add power_supply_changed() calls for proper uevent support 2013-02-02 19:07:34 -08:00
generic-adc-battery.c generic-adc-battery: Fix forever loop in gab_remove() 2013-02-16 13:27:09 -08:00
goldfish_battery.c power: Add battery driver for goldfish emulator 2013-02-02 19:06:34 -08:00
gpio-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
intel_mid_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
isp1704_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
jz4740-battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
Kconfig goldfish_battery: Add missing GENERIC_HARDIRQS dependency 2013-02-16 13:23:33 -08:00
lp8727_charger.c lp8727_charger: Small cleanup in naming 2013-02-02 19:33:52 -08:00
lp8788-charger.c lp8788-charger: Fix a parent device in kernel messages 2013-01-06 14:18:43 -08:00
Makefile Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500 2013-02-02 19:29:13 -08:00
max8903_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8925_power.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
max8997_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max8998_charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
max17040_battery.c max17040_battery: Use devm_kzalloc 2013-01-06 14:18:58 -08:00
max17042_battery.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
olpc_battery.c Drivers: power: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
pcf50633-charger.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
pda_power.c pda_power: Remove ac_draw_failed goto and label 2012-09-21 16:50:11 -07:00
pm2301_charger.c pm2301: LPN mode control support 2013-01-23 14:39:19 +00:00
pm2301_charger.h pm2301: LPN mode control support 2013-01-23 14:39:19 +00:00
pmu_battery.c
power_supply_core.c Highlights: 2012-12-13 19:26:04 -08: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 watchdog and safety timer expiries under PROP_HEALTH_* 2013-01-05 18:51:18 -08:00
power_supply.h device.h: cleanup users outside of linux/include (C files) 2012-03-11 14:27:37 -04:00
rx51_battery.c Drivers: power: remove __dev* attributes. 2013-01-03 15:57:14 -08:00
s3c_adc_battery.c power: remove use of __devinit 2012-11-28 11:43:22 -08:00
sbs-battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
smb347-charger.c power: remove use of __devexit_p 2012-11-28 11:43:22 -08:00
test_power.c test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties 2012-06-20 22:45:41 -07:00
tosa_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
twl4030_charger.c twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* 2012-11-18 16:14:52 -08:00
wm97xx_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_backup.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm831x_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
wm8350_power.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00
z2_battery.c power: remove use of __devexit 2012-11-28 11:43:22 -08:00