Messages in this thread | | | Date | Fri, 27 May 2011 14:54:07 +0400 | From | Anton Vorontsov <> | Subject | [GIT PULL] battery-2.6.git |
| |
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for 2.6.40.
There are support for new hardware + some fixes here and there, the usual stuff. :-)
You may notice the power-related change for Nokia N900 board (the ARM commmit). I took that patch via battery git tree to not create cross-tree dependencies. And of course it has an appropriate ack from OMAP maintainer to go through that tree.
Thanks!
The following changes since commit f0e615c3cb72b42191b558c130409335812621d8:
Linux 2.6.39-rc4 (2011-04-18 21:26:00 -0700)
are available in the git repository at: git://git.infradead.org/battery-2.6.git master
Anton Vorontsov (1): max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build)
Benson Leung (1): gpio-charger: Add gpio_charger_resume
John Stultz (1): power: Make test_power driver more dynamic.
Kalle Jokiniemi (2): isp1704_charger: Allow board specific powering routine ARM: RX-51: Enable isp1704 power on/off
Marek Vasut (1): PXA: Use dev_pm_ops in z2_battery
MyungJoo Ham (1): power_supply: Add driver for MAX8903 charger
Pali Rohár (1): bq27x00_battery: Name of cycle count property
Paul Parsons (2): ds2760_battery: Fix indexing of the 4 active full EEPROM registers ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery
arch/arm/mach-omap2/board-rx51-peripherals.c | 27 ++- drivers/power/Kconfig | 9 + drivers/power/Makefile | 1 + drivers/power/bq27x00_battery.c | 11 +- drivers/power/ds2760_battery.c | 6 +- drivers/power/gpio-charger.c | 15 + drivers/power/isp1704_charger.c | 22 ++ drivers/power/max8903_charger.c | 391 ++++++++++++++++++++++++++ drivers/power/test_power.c | 276 +++++++++++++++++- drivers/power/z2_battery.c | 20 +- include/linux/power/isp1704_charger.h | 29 ++ include/linux/power/max8903_charger.h | 57 ++++ 12 files changed, 840 insertions(+), 24 deletions(-) create mode 100644 drivers/power/max8903_charger.c create mode 100644 include/linux/power/isp1704_charger.h create mode 100644 include/linux/power/max8903_charger.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |