mirror of https://gitee.com/openkylin/linux.git
5a1203914a
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..
|
||
|---|---|---|
| .. | ||
| 88pm80x.c | ||
| 88pm800.c | ||
| 88pm805.c | ||
| 88pm860x-core.c | ||
| 88pm860x-i2c.c | ||
| Kconfig | ||
| Makefile | ||
| aat2870-core.c | ||
| ab3100-core.c | ||
| ab3100-otp.c | ||
| ab8500-core.c | ||
| ab8500-debugfs.c | ||
| ab8500-gpadc.c | ||
| ab8500-sysctrl.c | ||
| abx500-core.c | ||
| adp5520.c | ||
| arizona-core.c | ||
| arizona-i2c.c | ||
| arizona-irq.c | ||
| arizona-spi.c | ||
| arizona.h | ||
| as3711.c | ||
| asic3.c | ||
| cs5535-mfd.c | ||
| da903x.c | ||
| da9052-core.c | ||
| da9052-i2c.c | ||
| da9052-irq.c | ||
| da9052-spi.c | ||
| da9055-core.c | ||
| da9055-i2c.c | ||
| davinci_voicecodec.c | ||
| db8500-prcmu.c | ||
| dbx500-prcmu-regs.h | ||
| dm355evm_msp.c | ||
| ezx-pcap.c | ||
| htc-egpio.c | ||
| htc-i2cpld.c | ||
| htc-pasic3.c | ||
| intel_msic.c | ||
| janz-cmodio.c | ||
| jz4740-adc.c | ||
| lm3533-core.c | ||
| lm3533-ctrlbank.c | ||
| lp8788-irq.c | ||
| lp8788.c | ||
| lpc_ich.c | ||
| lpc_sch.c | ||
| max8907.c | ||
| max8925-core.c | ||
| max8925-i2c.c | ||
| max8997-irq.c | ||
| max8997.c | ||
| max8998-irq.c | ||
| max8998.c | ||
| max77686-irq.c | ||
| max77686.c | ||
| max77693-irq.c | ||
| max77693.c | ||
| mc13xxx-core.c | ||
| mc13xxx-i2c.c | ||
| mc13xxx-spi.c | ||
| mc13xxx.h | ||
| mcp-core.c | ||
| mcp-sa11x0.c | ||
| menelaus.c | ||
| mfd-core.c | ||
| omap-usb-host.c | ||
| omap-usb-tll.c | ||
| omap-usb.h | ||
| palmas.c | ||
| pcf50633-adc.c | ||
| pcf50633-core.c | ||
| pcf50633-gpio.c | ||
| pcf50633-irq.c | ||
| pm8xxx-irq.c | ||
| pm8921-core.c | ||
| rc5t583-irq.c | ||
| rc5t583.c | ||
| rdc321x-southbridge.c | ||
| retu-mfd.c | ||
| rtl8411.c | ||
| rts5209.c | ||
| rts5229.c | ||
| rtsx_pcr.c | ||
| rtsx_pcr.h | ||
| sec-core.c | ||
| sec-irq.c | ||
| sm501.c | ||
| smsc-ece1099.c | ||
| sta2x11-mfd.c | ||
| stmpe-i2c.c | ||
| stmpe-spi.c | ||
| stmpe.c | ||
| stmpe.h | ||
| syscon.c | ||
| t7l66xb.c | ||
| tc3589x.c | ||
| tc6387xb.c | ||
| tc6393xb.c | ||
| ti-ssp.c | ||
| ti_am335x_tscadc.c | ||
| timberdale.c | ||
| timberdale.h | ||
| tmio_core.c | ||
| tps6105x.c | ||
| tps6507x.c | ||
| tps6586x.c | ||
| tps65010.c | ||
| tps65090.c | ||
| tps65217.c | ||
| tps65910.c | ||
| tps65911-comparator.c | ||
| tps65912-core.c | ||
| tps65912-i2c.c | ||
| tps65912-irq.c | ||
| tps65912-spi.c | ||
| tps80031.c | ||
| twl-core.c | ||
| twl-core.h | ||
| twl4030-audio.c | ||
| twl4030-irq.c | ||
| twl4030-madc.c | ||
| twl4030-power.c | ||
| twl6030-irq.c | ||
| twl6040.c | ||
| ucb1x00-assabet.c | ||
| ucb1x00-core.c | ||
| ucb1x00-ts.c | ||
| ucb1400_core.c | ||
| vexpress-config.c | ||
| vexpress-sysreg.c | ||
| viperboard.c | ||
| vx855.c | ||
| wl1273-core.c | ||
| wm831x-auxadc.c | ||
| wm831x-core.c | ||
| wm831x-i2c.c | ||
| wm831x-irq.c | ||
| wm831x-otp.c | ||
| wm831x-spi.c | ||
| wm5102-tables.c | ||
| wm5110-tables.c | ||
| wm8350-core.c | ||
| wm8350-gpio.c | ||
| wm8350-i2c.c | ||
| wm8350-irq.c | ||
| wm8350-regmap.c | ||
| wm8400-core.c | ||
| wm8994-core.c | ||
| wm8994-irq.c | ||
| wm8994-regmap.c | ||
| wm8994.h | ||