* [GIT PULL] battery-2.6.git
@ 2013-09-11 5:24 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-09-11 5:24 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to receive changes prepared for the v3.12
release. Here is what we have:
New drivers:
- APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM).
- Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora).
- Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal Creek
Technologies).
- Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and Marek
Belisko (Golden Delicious Computers). The driver is used on Freerunner
GTA04 phones.
Highlighted fixes and improvements:
- Suspend/wakeup logic improvements: power supply objects will block
system suspend until all power supply events are processed. Thanks to
Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google).
Thanks!
Anton
The following changes since commit c095ba7224d8edc71dcef0d655911399a8bd4a3f:
Linux 3.11-rc4 (2013-08-04 13:46:46 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.12
for you to fetch changes up to db15e6312efd537e2deb2cbad110c23f98704a3c:
rx51_battery: Fix channel number when reading adc value (2013-08-30 17:49:15 -0700)
----------------------------------------------------------------
Abhimanyu Kapur (1):
power: reset: Add msm restart support
Andrea Adami (2):
power supply: collie_battery: Convert to use dev_pm_ops
power_supply: tosa_battery: Get rid of irq_to_gpio usage
Anton Vorontsov (1):
bq24190_charger: Workaround SS definition problem on i386 builds
Dan Carpenter (1):
ab8500-charger: We print an unintended error message
Jingoo Han (1):
power_supply: Replace strict_strtol() with kstrtol()
Kevin Hilman (1):
MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers
Libo Chen (1):
max8925_power: Fix missing of_node_put
Loc Ho (1):
power: Add APM X-Gene system reboot driver
Marek Belisko (3):
rx51_battery: Replace hardcoded channels values.
power: Add twl4030_madc battery driver.
rx51_battery: Fix channel number when reading adc value
Mark A. Greer (1):
bq24190_charger: Add support for TI BQ24190 Battery Charger
Paul Gortmaker (1):
power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
Pawel Moll (1):
vexpress-poweroff: Should depend on the required infrastructure
Peter Ujfalusi (1):
twl4030-charger: Fix compiler warning with regulator_enable()
Zoran Markovic (1):
power_supply: Prevent suspend until power supply events are processed
.../bindings/power_supply/msm-poweroff.txt | 17 +
MAINTAINERS | 8 +
drivers/power/Kconfig | 15 +-
drivers/power/Makefile | 2 +
drivers/power/ab8500_charger.c | 1 +
drivers/power/bq24190_charger.c | 1549 ++++++++++++++++++++
drivers/power/collie_battery.c | 2 +-
drivers/power/max8925_power.c | 1 +
drivers/power/power_supply_core.c | 38 +-
drivers/power/power_supply_sysfs.c | 2 +-
drivers/power/reset/Kconfig | 15 +-
drivers/power/reset/Makefile | 2 +
drivers/power/reset/msm-poweroff.c | 73 +
drivers/power/reset/xgene-reboot.c | 103 ++
drivers/power/rx51_battery.c | 14 +-
drivers/power/tosa_battery.c | 2 +-
drivers/power/twl4030_charger.c | 7 +-
drivers/power/twl4030_madc_battery.c | 245 ++++
include/linux/power/bq24190_charger.h | 16 +
include/linux/power/twl4030_madc_battery.h | 39 +
include/linux/power_supply.h | 3 +
21 files changed, 2137 insertions(+), 17 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/msm-poweroff.txt
create mode 100644 drivers/power/bq24190_charger.c
create mode 100644 drivers/power/reset/msm-poweroff.c
create mode 100644 drivers/power/reset/xgene-reboot.c
create mode 100644 drivers/power/twl4030_madc_battery.c
create mode 100644 include/linux/power/bq24190_charger.h
create mode 100644 include/linux/power/twl4030_madc_battery.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2014-01-21 17:54 Dmitry Eremin-Solenikov
0 siblings, 0 replies; 27+ messages in thread
From: Dmitry Eremin-Solenikov @ 2014-01-21 17:54 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, Anton Vorontsov
Hello Linus,
I'm picking up power supply maintainership from Anton Vorontov. Could
you please pull battery-2.6 git tree changes prepared for the v3.14
release.
The following changes since commit 93353e8088057dd988362e6cae727af43734b494:
max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.14
for you to fetch changes up to 573189354b7c97cd2256b87cf083ee435584594e:
MAINTAINERS: Pick up power supply maintainership (2014-01-21 03:33:09 +0400)
----------------------------------------------------------------
Highlights:
- Power supply notifier
- Several drivers gained DT support
- Added Maxim 14577 driver
- Change of maintainer
----------------------------------------------------------------
Anton Vorontsov (1):
charger-manager: of_cm_parse_desc() should be static
Dmitry Eremin-Solenikov (2):
gpio-charger: Support wakeup events
MAINTAINERS: Pick up power supply maintainership
Jonghwa Lee (3):
charger-manager: Modify the way of checking battery's temperature
charger-manager: Support deivce tree in charger manager driver
max17042_battery: Add IRQF_ONESHOT flag to use default irq handler
Krzysztof Kozlowski (1):
power_supply: Add charger support for Maxim 14577
Laxman Dewangan (2):
mfd: AS3722: Add dt node properties for system power controller
power: reset: Add as3722 power-off driver
Pali Rohár (2):
power_supply: Add power_supply notifier
bq2415x_charger: Use power_supply notifier for automode
Sebastian Reichel (4):
power_supply: Add power_supply_get_by_phandle
bq2415x_charger: Add DT support
isp1704_charger: Add DT support
dt: Binding documentation for isp1704 charger
Documentation/devicetree/bindings/mfd/as3722.txt | 11 +
.../devicetree/bindings/power/isp1704.txt | 17 ++
.../bindings/power_supply/charger-manager.txt | 81 ++++++
MAINTAINERS | 2 +-
drivers/power/Kconfig | 7 +
drivers/power/Makefile | 1 +
drivers/power/bq2415x_charger.c | 121 ++++++--
drivers/power/charger-manager.c | 299 +++++++++++++++++---
drivers/power/gpio-charger.c | 19 +-
drivers/power/isp1704_charger.c | 54 +++-
drivers/power/max14577_charger.c | 311 +++++++++++++++++++++
drivers/power/max17042_battery.c | 6 +-
drivers/power/power_supply_core.c | 44 +++
drivers/power/reset/Kconfig | 6 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/as3722-poweroff.c | 96 +++++++
include/linux/power/bq2415x_charger.h | 48 +---
include/linux/power/charger-manager.h | 34 ++-
include/linux/power/isp1704_charger.h | 1 +
include/linux/power_supply.h | 16 ++
20 files changed, 1043 insertions(+), 132 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/charger-manager.txt
create mode 100644 drivers/power/max14577_charger.c
create mode 100644 drivers/power/reset/as3722-poweroff.c
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2014-01-03 9:27 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2014-01-03 9:27 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to receive two fixes prepared for the
v3.13 release:
- Fix build error caused by max17042_battery conversion to the regmap API.
- Fix kernel oops when booting with wakeup_source_activate enabled.
Thank you!
Anton
The following changes since commit dc1ccc48159d63eca5089e507c82c7d22ef60839:
Linux 3.13-rc2 (2013-11-29 12:57:14 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.13-fixes
for you to fetch changes up to 93353e8088057dd988362e6cae727af43734b494:
max17042_battery: Fix build errors caused by missing REGMAP_I2C config (2013-12-01 14:25:03 -0800)
----------------------------------------------------------------
Austin Boyle (1):
max17042_battery: Fix build errors caused by missing REGMAP_I2C config
Shuah Khan (1):
power_supply: Fix Oops from NULL pointer dereference from wakeup_source_activate
drivers/power/Kconfig | 1 +
drivers/power/power_supply_core.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2013-11-18 2:08 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-11-18 2:08 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to receive changes prepared for the v3.13
release. Highlights:
- A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia.
- Device tree bindings for TWL4030 chips.
- Random fixes and cleanups.
Thank you,
Anton
The following changes since commit 61e6cfa80de5760bbe406f4e815b7739205754d2:
Linux 3.12-rc5 (2013-10-13 15:41:28 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.13
for you to fetch changes up to c8024234c20eaf7b163cc4dbd963cb9cd03a4ff1:
pm2301-charger: Remove unneeded NULL checks (2013-11-12 22:36:34 -0800)
----------------------------------------------------------------
Alexandre Belloni (1):
bq2415x_charger: Fix max battery regulation voltage
Anton Vorontsov (1):
power_supply: Fix documentation for TEMP_*ALERT* properties
Dan Carpenter (1):
pm2301-charger: Remove unneeded NULL checks
Darbha Sriharsha (1):
power_supply: Add support for bq24735 charger
Jonghwa Lee (2):
charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code
max17042_battery: Support regmap to access device's registers
Manish Badarkhe (2):
tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code
max17042_battery: Use SIMPLE_DEV_PM_OPS
NeilBrown (1):
twl4030_charger: Add devicetree support
Pali Rohár (1):
isp1704_charger: Fix driver to work with changes introduced in v3.5
Sachin Kamat (4):
ab8500-charger: Check return value of regulator_enable
ab8500-charger: Remove redundant break
pm2301-charger: Check return value of regulator_enable
pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt
Wei Yongjun (1):
tps65090-charger: Drop devm_free_irq of devm_ allocated irq
.../devicetree/bindings/power/twl-charger.txt | 20 +
.../bindings/power_supply/ti,bq24735.txt | 32 ++
Documentation/power/power_supply_class.txt | 8 +-
arch/arm/boot/dts/twl4030.dtsi | 6 +
drivers/power/Kconfig | 6 +
drivers/power/Makefile | 1 +
drivers/power/ab8500_charger.c | 17 +-
drivers/power/bq2415x_charger.c | 6 +-
drivers/power/bq24735-charger.c | 419 +++++++++++++++++++++
drivers/power/charger-manager.c | 85 ++---
drivers/power/isp1704_charger.c | 91 ++---
drivers/power/max17042_battery.c | 373 +++++++++---------
drivers/power/pm2301_charger.c | 27 +-
drivers/power/tps65090-charger.c | 30 +-
drivers/power/twl4030_charger.c | 47 ++-
include/linux/power/bq24735-charger.h | 39 ++
16 files changed, 852 insertions(+), 355 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/twl-charger.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/ti,bq24735.txt
create mode 100644 drivers/power/bq24735-charger.c
create mode 100644 include/linux/power/bq24735-charger.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2013-07-09 1:39 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-07-09 1:39 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to receive changes prepared for the v3.11
release. This time there is nothing exciting in there, just assorted fixes
and cleanups.
Thanks!
Anton
The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.11
for you to fetch changes up to 5a6c2208455f25b3e6f939adc2da59aa00d4806e:
charger-manager: Fix regulator_get() return check (2013-06-28 18:37:03 -0700)
----------------------------------------------------------------
Andrew Chew (1):
tps65090-charger: Fix AC detect
Anton Vorontsov (2):
MAINTAINERS: Update email address for Anton Vorontsov
power_supply: Move of_node out of the #ifdef CONFIG_OF
Axel Lin (3):
pm2301_charger: Fix NULL pointer dereference
pm2301_charger: Return error if create_singlethread_workqueue fails
generic-adc-battery: Fix checking if none of the channels are supported
Jingoo Han (10):
88pm860x_battery: Remove unnecessary platform_set_drvdata()
88pm860x_charger: Remove unnecessary platform_set_drvdata()
ab8500_bm: Remove unnecessary platform_set_drvdata()
bq27x00_battery: Remove unnecessary platform_set_drvdata()
gpio-charger: Remove unnecessary platform_set_drvdata()
jz4740-battery: Remove unnecessary platform_set_drvdata()
rx51_battery: Remove unnecessary platform_set_drvdata()
twl4030_charger: Remove unnecessary platform_set_drvdata()
power: Use platform_{get,set}_drvdata()
power_supply: Replace strict_strtoul() with kstrtoul()
Joe Perches (1):
charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt
Jonghwa Lee (2):
charger-manager: Fix a bug when it unregisters notifier block of extcon
charger-manager: Fix regulator_get() return check
Kees Cook (1):
charger-manager: Ensure event is not used as format string
Kim, Milo (1):
lp8727_charger: Support the device tree feature
Pawel Moll (1):
power/reset: Make the vexpress driver optional on arm and arm64
Rhyland Klein (3):
power_supply: Add of_node_put to fix refcount
sbs-battery: Add dt to power_supply struct
tps65090-charger: Add dt node to power_supply
.../bindings/power_supply/lp8727_charger.txt | 44 +++++++
MAINTAINERS | 8 +-
drivers/power/88pm860x_battery.c | 1 -
drivers/power/88pm860x_charger.c | 1 -
drivers/power/ab8500_btemp.c | 1 -
drivers/power/ab8500_charger.c | 2 -
drivers/power/ab8500_fg.c | 7 +-
drivers/power/abx500_chargalg.c | 1 -
drivers/power/bq27x00_battery.c | 2 -
drivers/power/charger-manager.c | 146 +++++++++------------
drivers/power/generic-adc-battery.c | 4 +-
drivers/power/gpio-charger.c | 2 -
drivers/power/intel_mid_battery.c | 2 +-
drivers/power/jz4740-battery.c | 4 +-
drivers/power/lp8727_charger.c | 68 ++++++++++
drivers/power/pcf50633-charger.c | 8 +-
drivers/power/pm2301_charger.c | 11 +-
drivers/power/power_supply_core.c | 4 +
drivers/power/reset/Kconfig | 3 +-
drivers/power/rx51_battery.c | 5 +-
drivers/power/sbs-battery.c | 1 +
drivers/power/tps65090-charger.c | 40 +++++-
drivers/power/twl4030_charger.c | 2 -
include/linux/power_supply.h | 4 +-
24 files changed, 241 insertions(+), 130 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/lp8727_charger.txt
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2013-05-25 22:23 Anton Vorontsov
@ 2013-05-25 23:23 ` David Woodhouse
2013-05-25 22:39 ` Anton Vorontsov
0 siblings, 1 reply; 27+ messages in thread
From: David Woodhouse @ 2013-05-25 23:23 UTC (permalink / raw)
To: Anton Vorontsov
Cc: Linus Torvalds, Andrew Morton, Stephen Rothwell, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 857 bytes --]
On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote:
> Please pull battery-2.6 git tree to get a few one-liners: wrong kfree
> usage fix, module alias fixup and kconfig adjustments. The patches really
> small, so for convenience I inline them here.
Please note git.infradead.org has just been migrated to a virtual
machine, and was rebooted once or twice after this pull request was
sent. We don't anticipate any more reboots imminently.
The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck
in the 20th century) should have propagated in DNS already and the
migration should theoretically be fairly seamless. But please let me
know if anything goes wrong.
It will be moving again, onto real hardware once it becomes available,
hopefully in the next week or so. It will retain the same IP addresses.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5745 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2013-05-25 23:23 ` David Woodhouse
@ 2013-05-25 22:39 ` Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-05-25 22:39 UTC (permalink / raw)
To: David Woodhouse
Cc: Linus Torvalds, Andrew Morton, Stephen Rothwell, linux-kernel
On Sun, May 26, 2013 at 12:23:32AM +0100, David Woodhouse wrote:
> On Sat, 2013-05-25 at 15:23 -0700, Anton Vorontsov wrote:
> > Please pull battery-2.6 git tree to get a few one-liners: wrong kfree
> > usage fix, module alias fixup and kconfig adjustments. The patches really
> > small, so for convenience I inline them here.
>
> Please note git.infradead.org has just been migrated to a virtual
> machine, and was rebooted once or twice after this pull request was
> sent. We don't anticipate any more reboots imminently.
>
> The new IP address (2001:1868:205::9, or 198.137.202.9 for those stuck
> in the 20th century) should have propagated in DNS already and the
> migration should theoretically be fairly seamless. But please let me
> know if anything goes wrong.
>
> It will be moving again, onto real hardware once it becomes available,
> hopefully in the next week or so. It will retain the same IP addresses.
Thanks a lot for your efforts and letting us know, David!
Anton
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2013-05-25 22:23 Anton Vorontsov
2013-05-25 23:23 ` David Woodhouse
0 siblings, 1 reply; 27+ messages in thread
From: Anton Vorontsov @ 2013-05-25 22:23 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to get a few one-liners: wrong kfree
usage fix, module alias fixup and kconfig adjustments. The patches really
small, so for convenience I inline them here.
Thanks!
Anton
The following changes since commit 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f:
pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.10-fixes
for you to fetch changes up to dccab6092d3c25bf943d12fb658e63fd88bf8b4a:
pm2301_charger: Fix module alias prefix (2013-05-10 11:57:14 -0700)
----------------------------------------------------------------
Axel Lin (2):
wm831x_backup: Fix wrong kfree call for devdata->backup.name
pm2301_charger: Fix module alias prefix
Randy Dunlap (1):
lp8788-charger: Fix kconfig dependency
Xiong Zhou (1):
bq27x00: Fix I2C dependency in KConfig
drivers/power/Kconfig | 2 ++
drivers/power/pm2301_charger.c | 2 +-
drivers/power/wm831x_backup.c | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
commit dccab6092d3c25bf943d12fb658e63fd88bf8b4a
Author: Axel Lin <axel.lin@ingics.com>
Date: Sat May 4 18:51:09 2013 +0800
pm2301_charger: Fix module alias prefix
This driver is a i2c driver, use "i2c" rather than "platform" prefix for
module alias.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index f123f3c..e9c6ba0 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
-MODULE_ALIAS("platform:pm2xxx-charger");
+MODULE_ALIAS("i2c:pm2xxx-charger");
MODULE_DESCRIPTION("PM2xxx charger management driver");
commit c909fc8573af3cff9184551e79cf37784b5ddc24
Author: Axel Lin <axel.lin@ingics.com>
Date: Sat May 4 13:57:55 2013 +0800
wm831x_backup: Fix wrong kfree call for devdata->backup.name
devdata->backup.name points to devdata->name, the memory for devdata->name
is part of struct wm831x_backup. Thus remove kfree call for
devdata->backup.name.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c
index 58cbb00..56fb509 100644
--- a/drivers/power/wm831x_backup.c
+++ b/drivers/power/wm831x_backup.c
@@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev)
struct wm831x_backup *devdata = platform_get_drvdata(pdev);
power_supply_unregister(&devdata->backup);
- kfree(devdata->backup.name);
return 0;
}
commit a2d0dbb4b55681874c5f288538ae55ae69baeaff
Author: Xiong Zhou <jencce.kernel@gmail.com>
Date: Tue May 7 10:15:56 2013 +0800
bq27x00: Fix I2C dependency in KConfig
This patch fixes build failure(randconfig) of next-20130501. When config
I2C as m, BATTERY_BQ27x00 as y, here comes the failure. The driver depends
on I2C only if I2C is not disabled, as Lars commented. Last version of
this patch make the driver depend on I2C unconditionally.
Failure message:
drivers/built-in.o: In function `bq27x00_read_i2c':
bq27x00_battery.c:(.text+0x1082a7): undefined reference to `i2c_transfer'
drivers/built-in.o: In function `bq27x00_battery_init':
bq27x00_battery.c:(.init.text+0x6085): undefined reference to `i2c_register_driver'
bq27x00_battery.c:(.init.text+0x60c7): undefined reference to `i2c_del_driver'
drivers/built-in.o: In function `bq27x00_battery_exit':
bq27x00_battery.c:(.exit.text+0xbf0): undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
Signed-off-by: Xiong Zhou <jencce.kernel@gmail.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 814bcb9..674e633 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -152,6 +152,7 @@ config BATTERY_SBS
config BATTERY_BQ27x00
tristate "BQ27x00 battery driver"
+ depends on I2C || I2C=n
help
Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.
commit 237a1b01fdb29df6a28d50d6dbe7a988c4fb3625
Author: Randy Dunlap <rdunlap@infradead.org>
Date: Wed May 1 12:18:43 2013 -0700
lp8788-charger: Fix kconfig dependency
Fix build errors in lp8788-charger by making it depend on IIO.
Fixes errors when CONFIG_IIO=m and CHARGER_LP8788=y.
lp8788-charger.c:(.text+0x2146b5): undefined reference to `iio_channel_get'
lp8788-charger.c:(.text+0x2146ce): undefined reference to `iio_channel_get'
lp8788-charger.c:(.text+0x214a86): undefined reference to `iio_read_channel_processed'
lp8788-charger.c:(.text+0x214b51): undefined reference to `iio_read_channel_processed'
lp8788-charger.c:(.text+0x214c30): undefined reference to `iio_read_channel_processed'
lp8788-charger.c:(.text+0x214d93): undefined reference to `iio_channel_release'
lp8788-charger.c:(.text+0x214dac): undefined reference to `iio_channel_release'
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Milo Kim <milo.kim@ti.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 339f802..814bcb9 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -284,6 +284,7 @@ config CHARGER_LP8788
tristate "TI LP8788 charger driver"
depends on MFD_LP8788
depends on LP8788_ADC
+ depends on IIO
help
Say Y to enable support for the LP8788 linear charger.
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2013-04-30 5:14 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-04-30 5:14 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6 git tree to receive changes queued for v3.10. Here
are some highlights for this merge cycle:
- OpenFirmware/DeviceTree support for the Power Supply core: the core now
automatically populates supplied_from hierarchy from the device tree.
With these patches chargers and batteries can now lookup each other
without the board files support shim. Rhyland Klein at NVIDIA did the
work;
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using the
AB85xx core and depends on some recent changes to it, so that is why the
driver comes through the battery tree. It has an appropriate ack from
the hwmon maintainer (i.e. Guenter Roeck). Martin Persson at ST-Ericsson
and Hongbo Zhang at Linaro authored the driver;
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The changes
touch mfd parts, but these were acked by the appropriate MFD maintainer
(i.e. Samuel Ortiz). Lee Jones at Linaro did most of the work and lead
the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones;
- Versatile Express poweroff driver moved into drivers/power/reset/.
- Tree-wise: use devm_kzalloc() where appropriate;
- Tree-wise: dev_pm_ops cleanups/fixes.
Thanks!
Anton
The following changes since commit 8bb9660418e05bb1845ac1a2428444d78e322cc7:
Linux 3.9-rc4 (2013-03-23 16:52:44 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.10
for you to fetch changes up to 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f:
pm2301-charger: Fix suspend/resume (2013-04-16 19:00:01 -0700)
----------------------------------------------------------------
Andrei Epure (1):
charger-manager: Use kmemdup instead of kzalloc + memcpy
Andrey Gelman (1):
test_power: Fix a bug in setting module parameter values
Anton Vorontsov (3):
Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Merge branch 'urgent'
Merge branch 'vexpress' of git://git.kernel.org/.../cmarinas/linux-aarch64
Catalin Marinas (2):
arm: vexpress: Move the poweroff/restart code to drivers/power/reset
arm: vexpress: Decouple vexpress-poweroff implementation from machine_desc
Daniel WILLERUD (1):
mfd: ab8500-gpadc: Implemented suspend/resume
Dariusz Szymczak (1):
mfd: ab8500-core: Hierarchical interrupt registers
Hakan Berg (3):
ab8500-btemp: Filter btemp readings
ab8500-fg: Allow capacity to raise from 1% when charging
ab8500-charger: Add AB8505_USB_LINK_STATUS
Hongbo Zhang (5):
ab8500_btemp: Make ab8500_btemp_get* interfaces public
ab8500_bmdata: Eliminate CamelCase warning of some variables
ab8500_{bmdata,fg}: Add const attributes to some data arrays
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
hwmon: Add ST-Ericsson ABX500 hwmon driver
Jingoo Han (15):
twl4030_charger: Use module_platform_driver_probe()
wm831x_backup: Use devm_kzalloc()
88pm860x_charger: Drop kfree of devm_kzalloc'd data
rx51_battery: Use devm_kzalloc()
pcf50633-charger: Use devm_kzalloc()
max8998_charger: Use devm_kzalloc()
max8997_charger: Use devm_kzalloc()
max8903_charger: Use devm_kzalloc()
isp1704_charger: Use devm_kzalloc()
gpio-charger: Use devm_kzalloc()
ds2780_battery: Use devm_kzalloc()
ds2760_battery: Use devm_kzalloc()
da9052-battery: Use devm_kzalloc()
da9030_battery: Use devm_kzalloc()
max8925_power: Use devm_kzalloc()
Jonas Aaberg (3):
mfd: ab8500-gpadc: Reread on failure
mfd: ab8500-debug: Better error handling on crash
mfd: ab8500-debug: Add wake-up info
Kim, Milo (1):
lp8788-charger: Use PAGE_SIZE for the sysfs read operation
Lars-Peter Clausen (5):
pm2301_charger: Remove __dev* annotations
ds2782_battery: Use dev_pm_ops
max17040_battery: Use dev_pm_ops
sbs-battery: Use dev_pm_ops
pm2301-charger: Fix suspend/resume
Lee Jones (33):
mfd: ab8500-gpadc: Add gpadc hw conversion
mfd: ab8500-core: APE Interrupts are not cleared
mfd: ab8500-debug: Function to save all ABB registers to mem
mfd: ab8500-core: Add ADC support for ab8540
mfd: ab8500-core: Rework MFD sub-device initialisation structures
mfd: ab8500-core: Add Interrupt support for ab8540
mfd: ab8500-debugfs: Add tests for ab8540 based platform initialisations
mfd: ab8500-debug: Add support for ab8505 and ab9540
mfd: ab8500-sysctrl: Add new reset function
mfd: ab8500-gpadc: Add support for the AB8540
mfd: ab8500-debug: Add support for the AB8540
mfd: ab8500-gpadc: Optimise GPADC driver
mfd: ab8500-core: Add additional resources to ab8505_iddet_resources
mfd: ab8500-debugfs: Dump sim registers
mfd: ab8500-debug: Add ADC input channel usb_id in debugfs
mfd: ab8500-debugfs: Change AB8500 debug permissions
mfd: ab8500-debug: Add register map for ab8540.
mfd: ab8500-debugfs: Trivially beautify the debugfs driver
pm2301_charger: Remove __exit, __init and __devexit_p()
abx500-chargalg: Store the AB8500 MFD parent device for platform differentiation
ab8500-fg: Add power cut feature for ab8505 and ab8540
ab8500-charger: Trivial coding style changes
ab8500-bm: Quick re-attach charging behaviour
ab8500-bm: Charge only mode fixes for the ab9540
ab8500_charger: Prevent auto drop of VBUS
ab8500-bm: Add usb power path support
ab8500-bm: Add support for the new ab8540 platform
abx500-chargalg: Prevent the watchdog from being kicked twice
ab8500-chargalg: Use hrtimer
pm2301-charger: Add pm_runtime_resume & pm_runtime_suspend
ab8500-charger: Remove duplicate code
abx500-chargalg: Add charging current step interface
ab8500-charger: Do not use [delayed_]work_pending()
Linus Walleij (1):
mfd: ab8500-debug: Add explicit dependencies
M BenZoubeir (1):
pm2301-charger: Adjust interrupt handler behavior
Marcus Cooper (4):
pm2301-charger: Always compile the PM2301 Charger driver with AB8500 Battery Mgnt
ab8500-charger: Use USBLink1Status Register
ab8500-charger: Add UsbLineCtrl2 reference
ab8500-bm: Trivially fix up some incorrect and out-of-date comments
Marcus Danielsson (1):
mfd: ab8500-sysctrl: Error check clean up
Martin Bergstrom (1):
ab8500-fg: Report unscaled capacity
Mattias Wallin (2):
mfd: ab8500-debug: Print banks in hex
mfd: ab8500-core: Show turn on status at boot
Mustapha Ben Zoubeir (1):
pm2301-charger: Resolve I2C detection problem on ab9540
Pali Rohár (1):
rx51_battery: Fix reporting temperature
Per Forlin (1):
pm2301-charger: Force main charger detect
Rabin Vincent (2):
mfd: ab8500-sysctrl: AB8505 doesn't have SYSCLKREQ5..8
ab8500-charger: Run detect workaround only on AB8500
Rajkumar Kasirajan (2):
mfd: ab8500-sysctrl: Update correct turn on status
pm2301-charger: Enable SW EOC control on the ab9540
Rhyland Klein (7):
power_supply: Add OF bindings documentation for tps65090-charger
power_supply: Add support for tps65090-charger
tps65090: Update bindings for subnode
tps65090: Setup compatible property for dt
power_supply: Define Binding for power-supplies
power_supply: Add core support for supplied_from
power_supply: Populate supplied_from hierarchy from the device tree
Rupesh Kumar (8):
pm2301-charger: Support for over voltage protection on the ab9540
pm2301-charger: Die temp thermal protection
pm2301-charger: Wake system when ext charger is plugged-in
ab8500-btemp: Defer btemp filtering while initialising
pm2301-charger: Removed unused code from PM2301 driver
pm2301-charger: Charging LED control for pm2301
pm2301-charger: Wake device on register access
pm2301-charger: Reference put missing after access
Sachin Kamat (1):
sbs-battery: Use of_match_ptr() macro
Silviu-Mihai Popescu (1):
goldfish_battery: Use resource_size()
Syam Sidhardhan (1):
s3c-adc-battery: Fix possible NULL pointer dereference
Ulf Hansson (1):
mfd: ab8500-core: Add abx500-clk as an mfd child device
Yang QU (1):
ab8500-charger: Add backup battery charge voltages on the ab8540
lme00437 (2):
pm2301-charger: lpn pin used only in C2C boards
ab8500-fg: Change current calculation
srinidhi kasagar (2):
mfd: ab8500-debug: Convert to kstrtoul_from_user
abx500-chargalg: Use module_platform_driver() rather
.../bindings/power_supply/power_supply.txt | 23 +
.../devicetree/bindings/power_supply/tps65090.txt | 17 +
Documentation/hwmon/ab8500 | 22 +
Documentation/hwmon/abx500 | 28 +
arch/arm/mach-vexpress/Kconfig | 3 +
arch/arm/mach-vexpress/Makefile | 2 +-
arch/arm/mach-vexpress/v2m.c | 5 -
drivers/hwmon/Kconfig | 13 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/ab8500.c | 206 ++
drivers/hwmon/abx500.c | 491 ++++
drivers/hwmon/abx500.h | 69 +
drivers/mfd/ab8500-core.c | 544 +++--
drivers/mfd/ab8500-debugfs.c | 2559 +++++++++++++++-----
drivers/mfd/ab8500-gpadc.c | 559 ++++-
drivers/mfd/ab8500-sysctrl.c | 98 +-
drivers/power/88pm860x_charger.c | 2 -
drivers/power/Kconfig | 14 +-
drivers/power/Makefile | 4 +-
drivers/power/ab8500_bmdata.c | 140 +-
drivers/power/ab8500_btemp.c | 80 +-
drivers/power/ab8500_charger.c | 699 ++++--
drivers/power/ab8500_fg.c | 501 +++-
drivers/power/abx500_chargalg.c | 455 +++-
drivers/power/charger-manager.c | 3 +-
drivers/power/da9030_battery.c | 6 +-
drivers/power/da9052-battery.c | 5 +-
drivers/power/ds2760_battery.c | 4 +-
drivers/power/ds2780_battery.c | 7 +-
drivers/power/ds2782_battery.c | 23 +-
drivers/power/goldfish_battery.c | 2 +-
drivers/power/gpio-charger.c | 5 +-
drivers/power/isp1704_charger.c | 5 +-
drivers/power/lp8788-charger.c | 8 +-
drivers/power/max17040_battery.c | 20 +-
drivers/power/max8903_charger.c | 4 +-
drivers/power/max8925_power.c | 5 +-
drivers/power/max8997_charger.c | 9 +-
drivers/power/max8998_charger.c | 5 +-
drivers/power/pcf50633-charger.c | 7 +-
drivers/power/pm2301_charger.c | 391 ++-
drivers/power/pm2301_charger.h | 23 +-
drivers/power/power_supply_core.c | 187 +-
drivers/power/reset/Kconfig | 7 +
drivers/power/reset/Makefile | 3 +-
.../power/reset/vexpress-poweroff.c | 9 +-
drivers/power/rx51_battery.c | 8 +-
drivers/power/s3c_adc_battery.c | 7 +-
drivers/power/sbs-battery.c | 22 +-
drivers/power/test_power.c | 31 +-
drivers/power/tps65090-charger.c | 320 +++
drivers/power/twl4030_charger.c | 12 +-
drivers/power/wm831x_backup.c | 10 +-
include/linux/mfd/abx500.h | 27 +-
include/linux/mfd/abx500/ab8500-bm.h | 61 +-
include/linux/mfd/abx500/ab8500-gpadc.h | 74 +-
include/linux/mfd/abx500/ab8500-sysctrl.h | 6 +
include/linux/mfd/abx500/ab8500.h | 3 +
include/linux/mfd/abx500/ux500_chargalg.h | 7 +
include/linux/mfd/tps65090.h | 5 +
include/linux/pm2301_charger.h | 2 +-
include/linux/power/ab8500.h | 16 +
include/linux/power_supply.h | 6 +
include/linux/vexpress.h | 3 -
64 files changed, 6393 insertions(+), 1500 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/power_supply.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/tps65090.txt
create mode 100644 Documentation/hwmon/ab8500
create mode 100644 Documentation/hwmon/abx500
create mode 100644 drivers/hwmon/ab8500.c
create mode 100644 drivers/hwmon/abx500.c
create mode 100644 drivers/hwmon/abx500.h
rename arch/arm/mach-vexpress/reset.c => drivers/power/reset/vexpress-poweroff.c (93%)
create mode 100644 drivers/power/tps65090-charger.c
create mode 100644 include/linux/power/ab8500.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2013-02-19 7:09 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2013-02-19 7:09 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Here is a battery/power_supply queue for v3.9. There are two tags:
for-v3.9 and for-v3.9-merged. The second one is exactly the same as the
first one, except that in the -merged tag I merged v3.8 back into battery
tree to fix some conflicts so that you wouldn't need to do it.
Highlights (included in tag message):
- 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.
Please pull.
Thanks!
The following changes since commit 19f949f52599ba7c3f67a5897ac6be14bfcb1200:
Linux 3.8 (2013-02-18 15:58:34 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.9-merged
for you to fetch changes up to 845e37e009281b63fe15348f37bd7f815ea65da0:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2013-02-18 22:55:13 -0800)
----------------------------------------------------------------
Andrew Lunn (3):
power/reset: Add a new driver to turn QNAP board power off
power/reset: Add a new driver implementing 'power off by restarting'
qnap-poweroff: Fix license string
Anton Vorontsov (4):
Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Merge branch 'ab8500-from-Rajanikanth'
Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Merge git://git.kernel.org/.../torvalds/linux
Chanwoo Choi (1):
charger-manager: Split _probe funtion to make the code more clean
Dan Carpenter (2):
lp8727_charger: Small cleanup in naming
generic-adc-battery: Fix forever loop in gab_remove()
Devendra Naga (1):
max17040_battery: Use devm_kzalloc
Evgeny Romanov (1):
ds2782_battery: Add power_supply_changed() calls for proper uevent support
Hakan Berg (5):
ab8500_btemp: Ignore false btemp low interrupt
ab8500_bm: Adds support for Car/Travel Adapters
ab8500_btemp: Remove superfluous BTEMP thermal comp
ab8500_fg: Added support for BATT_OVV
ab8500-fg: Adjust for RF bursts voltage drops
Heiko Carstens (1):
goldfish_battery: Add missing GENERIC_HARDIRQS dependency
Henrik Sölver (1):
ab8500-charger: AB workaround for invalid charger
Johan Bjornstedt (2):
ab8500_charger: Charger current step-up/down
ab8500_bm: Skip first CCEOC irq for instant current
Jonas Aaberg (5):
ab8500_btemp: Detect battery type in workqueue
ab8500_fg: Replace msleep() with usleep_range() for greater accuracy
ab8500_charger: Handle gpadc errors
ab8500-bm: Flush all work queues before suspending
ab8500-charger: Do not touch VBUSOVV bits
Julia Lawall (1):
88pm860x_battery: Eliminate possible references to released resources
Kalle Komierowski (1):
ab8500_fg: Don't clear the CCMuxOffset bit
Kim, Milo (4):
MAINTAINERS: Add LP8727 charger driver entry
MAINTAINERS: Add LP8788 MFD driver entry
lp8788-charger: Fix a parent device in _probe()
lp8788-charger: Fix a parent device in kernel messages
Lee Jones (19):
ab8500_btemp: Fix crazy tabbing implementation
ab8500-bmdata: Re-jiggle bmdevs_of_probe to be more succinct
ab8500_bm: Rename battery management platform data to something more logical
ab8500_bm: Always send platform specific battery information via pdata
ab8500_btemp: Reorder obtainment of platform specific battery management data
ab8500_charger: Reorder obtainment of platform specific battery management data
ab8500_fg: Reorder obtainment of platform specific battery management data
abx500_chargalg: Reorder obtainment of platform specific battery management data
ab8500_bm: Make the battery Device Tree node reference less cryptic
ab8500_charger: Detect charger removal
ab8500_btemp: Allign battery temperature resolution with the framework
ab8500_fg: Remove pointless round_jiffies() call
ab8500-charger: Kick watchdog
ab8500-chargalg: Update battery health on safety timer exp
pm2301: Move all configuration and emum structs out to a header file
ab8500-chargalg: Only root should have write permission on sysfs file
abx500-chargalg: Add new sysfs interface to get current charge status
pm2301: LPN mode control support
ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
Loic Pallardy (2):
pm2301: Remove volt_now & curr_now properties
pm2301: Update watchdog for pm2xxx support
Marcus Cooper (3):
ab8500_bm: Recharge condition not optimal for battery
ab8500_charger: Remove unused defines
ab8500_charger: Adds support for legacy USB chargers
Martin Bergström (1):
ab8500-fg: Go to INIT_RECOVERY when charger removed
Michal Hocko (1):
da9030_battery: Include notifier.h
Michel JAOUEN (2):
pm2301: Provide u9540 support for the pm2301 charger
ab8500-btemp: Adaptation to AB8505 and AB9540 platforms
Mike Lockwood (1):
power: Add battery driver for goldfish emulator
NeilBrown (1):
bq27x00_battery: Fix bugs introduced with BQ27425 support
Nickolai Zeldovich (1):
da9052-battery: Avoid out-of-range array access
Nicolas Guion (1):
ab8500-charger: Add support for autopower on AB8505 and AB9540
Olivier Clergeaud (1):
pm2301: Clean-up PM2301 interrupt management
Paer-Olof Haakansson (3):
ab8500_charger: Rename the power_loss function
ab8500_fg: Overflow in current calculation
u8500-charger: Delay for USB enumeration
Pali Rohár (2):
bq27x00_battery: Fix reporting battery temperature
bq2415x_charger: Add support for offline and 100mA mode
Rajanikanth H.V (4):
ab8500: remove explicit handling of battery type
ab8500: Remove initial "UNKNOWN" battery-type string assignment
ab8500: Promote ab8500_fg probe before ab8500_btemp probe
ab8500_btemp: Demote initcall sequence
Rajkumar Kasirajan (2):
pm2301: Enable vbat low monitoring
ab8500-fg: Use correct battery charge full design
Ramakrishna Pallala (1):
power_supply: Add watchdog and safety timer expiries under PROP_HEALTH_*
Rickard Andersson (1):
ab8500_fg: Balance IRQ enable
Sachin Kamat (4):
bq2415x_charger: Remove unneeded version.h inclusion
bq2415x_charger: Use module_i2c_driver
bq2415x_charger: Use devm_kzalloc()
ab8500_charger: Use devm_regulator_get API
Tejun Heo (1):
charger_manager: Don't use [delayed_]work_pending()
Thierry Reding (1):
power/reset: Remove newly introduced __dev* annotations
pender01 (1):
ab8500_fg: Round capacity output
.../bindings/power_supply/qnap-poweroff.txt | 13 +
.../bindings/power_supply/restart-poweroff.txt | 8 +
MAINTAINERS | 16 +
drivers/mfd/ab8500-core.c | 14 +-
drivers/power/88pm860x_battery.c | 13 +-
drivers/power/Kconfig | 14 +
drivers/power/Makefile | 4 +-
drivers/power/ab8500_bmdata.c | 524 ++++----
drivers/power/ab8500_btemp.c | 192 +--
drivers/power/ab8500_charger.c | 1067 ++++++++++++----
drivers/power/ab8500_fg.c | 447 +++++--
drivers/power/abx500_chargalg.c | 204 ++--
drivers/power/bq2415x_charger.c | 54 +-
drivers/power/bq27x00_battery.c | 12 +-
drivers/power/charger-manager.c | 310 +++--
drivers/power/da9030_battery.c | 1 +
drivers/power/da9052-battery.c | 2 +-
drivers/power/ds2782_battery.c | 69 ++
drivers/power/generic-adc-battery.c | 16 +-
drivers/power/goldfish_battery.c | 236 ++++
drivers/power/lp8727_charger.c | 8 +-
drivers/power/lp8788-charger.c | 17 +-
drivers/power/max17040_battery.c | 4 +-
drivers/power/pm2301_charger.c | 1088 +++++++++++++++++
drivers/power/pm2301_charger.h | 513 ++++++++
drivers/power/power_supply_sysfs.c | 3 +-
drivers/power/reset/Kconfig | 17 +
drivers/power/reset/Makefile | 2 +
drivers/power/reset/qnap-poweroff.c | 116 ++
drivers/power/reset/restart-poweroff.c | 65 +
include/linux/mfd/abx500.h | 15 +-
include/linux/mfd/abx500/ab8500-bm.h | 26 +-
include/linux/mfd/abx500/ab8500.h | 24 +
include/linux/mfd/abx500/ux500_chargalg.h | 5 +
include/linux/pm2301_charger.h | 61 +
include/linux/power/bq2415x_charger.h | 3 +-
include/linux/power_supply.h | 2 +
37 files changed, 4197 insertions(+), 988 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/restart-poweroff.txt
create mode 100644 drivers/power/goldfish_battery.c
create mode 100644 drivers/power/pm2301_charger.c
create mode 100644 drivers/power/pm2301_charger.h
create mode 100644 drivers/power/reset/qnap-poweroff.c
create mode 100644 drivers/power/reset/restart-poweroff.c
create mode 100644 include/linux/pm2301_charger.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-12-12 10:22 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-12-12 10:22 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel,
Pali Rohár, Ramakrishna Pallala
Hello Linus,
Here are a few updates and new drivers queued for v3.8. All the patches
were sitting in the -next tree for awhile, except for the last merge
commit -- I made it a few hours ago just to fix some conflicts, so that
you won't have to bother.
Highlights for this pull:
- Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
bq2415x_charger. The drivers are a part of a solution to replace the
proprietary Nokia BME stack;
- Power supply core now registers devices with a thermal cooling
subsystem, so we can now automatically throttle charging. Thanks to
Ramakrishna Pallala!
- Device tree support for ab8500 and max8925_power drivers;
- Random fixups and enhancements for a bunch of drivers.
Thanks!
The following changes since commit 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf:
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2012-12-11 20:01:33 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.8-merged
for you to fetch changes up to 76d8a23b127020472207b281427d3e9f4f1227e4:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2012-12-11 22:15:57 -0800)
----------------------------------------------------------------
Alan Cox (1):
max17042_battery: Fix missing verify_model_lock() return value check
Anton Vorontsov (3):
bq2415x_charger: Add Kconfig/Makefile entries
bq2415x_charger: Fix style issues
Merge git://git.kernel.org/.../torvalds/linux
Axel Lin (1):
generic-adc-battery: Fix checking return value of request_any_context_irq
Dan Carpenter (2):
generic-adc-battery: Pointer math issue in gab_probe()
ds2782_battery: Fix signedness bug in ds278x_read_reg16()
Kim, Milo (3):
lp8788-charger: Use consumer device name on setting IIO channels
lp8788-charger: Fix wrong ADC conversion
lp8788-charger: Fix ADC channel names
Marcos Paulo de Souza (2):
jz4740-battery: Use devm_kzalloc
jz4740-battery: Use devm_request_and_ioremap
Pali Rohár (3):
power_supply: Add new Nokia RX-51 (N900) power supply battery driver
power_supply: Add bq2415x charger driver
bq27x00_battery: Fixup nominal available capacity reporting
Peter Ujfalusi (1):
twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
Qing Xu (1):
max8925_power: Add support for device-tree initialization
Rajanikanth H.V (4):
ab8500: Add devicetree support for fuelgauge
ab8500: Add devicetree support for btemp
ab8500: Add devicetree support for charger
ab8500: Add devicetree support for chargalg
Ramakrishna Pallala (2):
power_supply: Add support for CHARGE_CONTROL_* attributes
power_supply: Register power supply for thermal cooling device
Documentation/devicetree/bindings/mfd/ab8500.txt | 27 +-
Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt | 16 +
.../devicetree/bindings/power_supply/ab8500/chargalg.txt | 16 +
.../devicetree/bindings/power_supply/ab8500/charger.txt | 25 +
Documentation/devicetree/bindings/power_supply/ab8500/fg.txt | 58 +
Documentation/power/power_supply_class.txt | 3 +
arch/arm/boot/dts/dbx5x0.dtsi | 28 +-
drivers/mfd/ab8500-core.c | 20 +
drivers/power/Kconfig | 23 +-
drivers/power/Makefile | 4 +-
drivers/power/ab8500_bmdata.c | 521 +++++++++
drivers/power/ab8500_btemp.c | 77 +-
drivers/power/ab8500_charger.c | 84 +-
drivers/power/ab8500_fg.c | 82 +-
drivers/power/abx500_chargalg.c | 56 +-
drivers/power/bq2415x_charger.c | 1670 ++++++++++++++++++++++++++++
drivers/power/bq27x00_battery.c | 8 +
drivers/power/ds2782_battery.c | 4 +-
drivers/power/generic-adc-battery.c | 5 +-
drivers/power/jz4740-battery.c | 45 +-
drivers/power/lp8788-charger.c | 75 +-
drivers/power/max17042_battery.c | 3 +-
drivers/power/max8925_power.c | 51 +-
drivers/power/power_supply_core.c | 96 ++
drivers/power/power_supply_sysfs.c | 2 +
drivers/power/rx51_battery.c | 251 +++++
drivers/power/twl4030_charger.c | 12 +-
include/linux/mfd/abx500.h | 34 +-
include/linux/mfd/lp8788.h | 8 +-
include/linux/power/bq2415x_charger.h | 95 ++
include/linux/power_supply.h | 3 +
31 files changed, 3123 insertions(+), 279 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/charger.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/fg.txt
create mode 100644 drivers/power/ab8500_bmdata.c
create mode 100644 drivers/power/bq2415x_charger.c
create mode 100644 drivers/power/rx51_battery.c
create mode 100644 include/linux/power/bq2415x_charger.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-10-05 3:04 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-10-05 3:04 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Here are some battery tree updates for 3.7...
The following changes since commit 0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096:
mfd: core: Push irqdomain mapping out into devices (2012-09-15 23:22:04 +0200)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.7
for you to fetch changes up to 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc:
Merge with upstream to accommodate with MFD changes (2012-09-24 19:12:01 -0700)
----------------------------------------------------------------
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.
----------------------------------------------------------------
Anton Vorontsov (5):
da9052-battery: Fix da9052_determine_vc_tbl_index's return value
da9030_battery: Don't use 0 as NULL
charger-manager: Fix struct charger_desc's misleading comment
88pm860x_battery and charger: Fix a few post-merge issues
Merge with upstream to accommodate with MFD changes
Axel Lin (1):
power_supply: Remove broken mark for da9052-battery
Chanwoo Choi (5):
charger-manager: Disable regulator when charger cable is detached
charger-manager: Use replacement variable to check state of battery
charger-manager: Check fully charged state of battery periodically
charger-manager: Support limit of maximum possible
charger-manager: Add support sysfs entry for charger
Dan Carpenter (1):
da9052-battery: Don't free IRQ that wasn't requested
Devendra Naga (3):
lp8727_charger: Unregister power supply at error path of lp8727_register_psy
ds2781_battery: Convert to module_platform_driver
ds2781_battery: Replace call to kzalloc with devm_kzalloc
Fengguang Wu (2):
lp8727_charger: Use IRQF_ONESHOT
twl4030_charger: Use IRQF_ONESHOT
Il Han (1):
twl4030_charger: It would be better not to use the 0b-prefix
Jett.Zhou (1):
power_supply: Enable battery-charger for 88pm860x
Julia Lawall (5):
ab8500_charger: Fix error return code
wm97xx_battery: Fix error return code
ab8500_btemp: Fix error return code
ab8500_fg: Fix error return code
bq27x00_battery: Fix error return code
Kim, Milo (23):
power_supply: Add new lp8788 charger driver
lp8727_charger: Use devm_kzalloc()
lp8727_charger: Cleanup _probe() and _remove()
lp8727_charger: Fix buggy code of NULL pdata
lp8727_charger: Add configurable debouce timer
lp8727_charger: Remove unnecessary workqueue thread
lp8727_charger: Clean up the interrupt handler
lp8727_charger: Clear interrrupts at inital time
lp8727_charger: Fix code for getting battery temp
lp8727_charger: Use the definition rather than enum
lp8727_charger: Clean up lp8727 definitions
lp8727_charger: Use specific definition
lp8727_charger: Clean up lp8727_is_charger_attached()
lp8727_charger: Make lp8727_init_device() shorter
lp8727_charger: Make lp8727_ctrl_switch() inline
lp8727_charger: Make lp8727_charger_get_propery() simpler
lp8727_charger: Return if the battery is discharging
lp8727_charger: Clean up lp8727_charger_changed()
lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
lp8727_charger: Fix a typo - chg_parm to chg_param
lp8727_charger: Add description in the private data
lp8727_charger: Fix checkpatch warning
lp8727_charger: More pure cosmetic improvements
Olof Johansson (1):
sbs-battery: Probe should try talking to the device
Paul Parsons (2):
pda_power: Fix ac_draw usage before it being set
pda_power: Remove ac_draw_failed goto and label
Ramakrishna Pallala (3):
power_supply: Add new power supply AUTHENTIC property
power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX
smb347-charger: Fix battery status reporting logic for charger faults
Documentation/power/power_supply_class.txt | 7 +
drivers/mfd/88pm860x-core.c | 22 +-
drivers/power/88pm860x_battery.c | 1041 ++++++++++++++++++++++
drivers/power/88pm860x_charger.c | 746 ++++++++++++++++
drivers/power/Kconfig | 20 +-
drivers/power/Makefile | 3 +
drivers/power/ab8500_btemp.c | 1 +
drivers/power/ab8500_charger.c | 1 +
drivers/power/ab8500_fg.c | 1 +
drivers/power/bq27x00_battery.c | 3 +-
drivers/power/charger-manager.c | 434 ++++++++-
drivers/power/da9030_battery.c | 4 +-
drivers/power/da9052-battery.c | 11 +-
drivers/power/ds2781_battery.c | 28 +-
drivers/power/lp8727_charger.c | 360 ++++----
drivers/power/lp8788-charger.c | 795 +++++++++++++++++
drivers/power/pda_power.c | 13 +-
drivers/power/power_supply_sysfs.c | 3 +
drivers/power/sbs-battery.c | 10 +
drivers/power/smb347-charger.c | 97 +-
drivers/power/twl4030_charger.c | 25 +-
drivers/power/wm97xx_battery.c | 4 +-
include/linux/mfd/88pm860x.h | 84 +-
include/linux/platform_data/lp8727.h | 51 +-
include/linux/power/charger-manager.h | 47 +-
include/linux/power_supply.h | 5 +
26 files changed, 3519 insertions(+), 297 deletions(-)
create mode 100644 drivers/power/88pm860x_battery.c
create mode 100644 drivers/power/88pm860x_charger.c
create mode 100644 drivers/power/lp8788-charger.c
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-07-31 13:05 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-07-31 13:05 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
It's almost a normal pull request: a bunch of small fixes and assorted
enhancements, and as usual my gpg key is not signed, etc.
One thing makes it unusual, though: one of our patches added thermal
support for power supply class, but thermal/ subsystem changed under our
feet. We (well, Stephen, that is) caught the issue and it was decided[1]
that I'd just delay the battery pull request, and then will fix it up by
merging your tree back into mine at the specific commit. And I did
exactly that.
That's not all though: another[2] small fixup for thermal subsystem was
needed to get rid of a warning in power supply subsystem (the warning
was not drivers/power's "fault", the thermal registration function just
needed a proper const annotation, which is also done by a small commit
on top of the merge.
So, to sum this up:
- The 'master' branch of the battery tree was in -next for weeks,
and was never rebased, altered etc;
- for-v3.6 tag contains the 'master' branch + merge + the warning fix.
Thanks!
[1] http://lkml.org/lkml/2012/6/19/23
[2] http://lkml.org/lkml/2012/6/18/28
The following changes since commit c56f5c0342dfee11a1a13d2f5bb7618de5b17590:
Thermal: Make Thermal trip points writeable (2012-07-24 23:17:20 -0400)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.6
for you to fetch changes up to 4b1bf5871f7d59de6484cc887e205d6d2f1e6fbd:
thermal: Constify 'type' argument for the registration routine (2012-07-31 05:45:37 -0700)
----------------------------------------------------------------
Anton Vorontsov (3):
ds2781_battery: w1_ds2781_read() should be static
Merge with upstream to accommodate with thermal changes
thermal: Constify 'type' argument for the registration routine
Chanwoo Choi (3):
charger-manager: Use EXTCON Subsystem to detect charger cables for charging
charger-manager: Set current limit of regulator for over current protection
charger-manager: Fix build break related to EXTCON
Dmitry Eremin-Solenikov (2):
test_power: Add support for USB AC source
test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
Jenny TC (1):
power_supply: Register battery as a thermal zone
Kim, Milo (1):
lp8727_charger: Move header file into platform_data directory
Mark Brown (1):
pda_power: Complain if regulator operations fail
NeilBrown (3):
twl4030_charger: Fix some typos
twl4030_charger: Add backup-battery charging
twl4030_charger: Allow charger to control the regulator that feeds it
Nikolaus Voss (1):
sbs-battery: Don't trigger false supply_changed event
Pritesh Raithatha (1):
gpio-charger: Use cansleep version of gpio_set_value
Ramakrishna Pallala (4):
power_supply: Add constant charge_current and charge_voltage properties
smb347-charger: Add constant charge and current properties
max17042_battery: Support CHARGE_COUNTER power supply attribute
power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
Richard A. Smith (2):
olpc-battery: Add VOLTAGE_MAX_DESIGN property
olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
Saranya Gopal (1):
bq27x00_battery: Add support for BQ27425 chip
Syed Rafiuddin (1):
bq27x00_battery: Add support for power average and health properties
Documentation/power/power_supply_class.txt | 10 ++
drivers/mfd/twl-core.c | 9 +-
drivers/power/Kconfig | 1 +
drivers/power/bq27x00_battery.c | 155 +++++++++++++++++++++++++---
drivers/power/charger-manager.c | 152 ++++++++++++++++++++++++---
drivers/power/ds2781_battery.c | 2 +-
drivers/power/gpio-charger.c | 2 +-
drivers/power/lp8727_charger.c | 2 +-
drivers/power/max17042_battery.c | 8 ++
drivers/power/olpc_battery.c | 62 ++++++++++-
drivers/power/pda_power.c | 4 +-
drivers/power/power_supply_core.c | 65 ++++++++++++
drivers/power/power_supply_sysfs.c | 8 ++
drivers/power/sbs-battery.c | 2 +-
drivers/power/smb347-charger.c | 123 ++++++++++++++++++++--
drivers/power/test_power.c | 75 ++++++++++++++
drivers/power/twl4030_charger.c | 80 +++++++++++++-
drivers/thermal/thermal_sys.c | 2 +-
include/linux/i2c/twl.h | 2 +
include/linux/{ => platform_data}/lp8727.h | 0
include/linux/power/charger-manager.h | 67 +++++++++++-
include/linux/power_supply.h | 13 +++
include/linux/thermal.h | 2 +-
23 files changed, 789 insertions(+), 57 deletions(-)
rename include/linux/{ => platform_data}/lp8727.h (100%)
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2012-05-31 1:08 Anton Vorontsov
2012-05-31 1:17 ` Stephen Rothwell
@ 2012-05-31 19:13 ` Linus Torvalds
1 sibling, 0 replies; 27+ messages in thread
From: Linus Torvalds @ 2012-05-31 19:13 UTC (permalink / raw)
To: cbouatmailru
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
On Wed, May 30, 2012 at 6:08 PM, Anton Vorontsov <cbouatmailru@gmail.com> wrote:
>
> I guess my pull requests have a distinct style already: they are somewhat
> boring (in sense that it's just a pile of fixes), late, and my gpg key is
> not signed by anyone. :-)
It would be nice to see it signed, but even unsigned you can see that
it's at least the *same* key as the last two times. So it means
something, I guess.
Linus
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2012-05-31 1:08 Anton Vorontsov
@ 2012-05-31 1:17 ` Stephen Rothwell
2012-05-31 19:13 ` Linus Torvalds
1 sibling, 0 replies; 27+ messages in thread
From: Stephen Rothwell @ 2012-05-31 1:17 UTC (permalink / raw)
To: cbouatmailru; +Cc: Linus Torvalds, Andrew Morton, David Woodhouse, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
Hi Anton,
On Wed, 30 May 2012 18:08:45 -0700 Anton Vorontsov <cbouatmailru@gmail.com> wrote:
>
> I guess my pull requests have a distinct style already: they are somewhat
> boring (in sense that it's just a pile of fixes), late, and my gpg key is
> not signed by anyone. :-)
At least you get points for it all being in linux-next since before the
merge window opened. ;-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-05-31 1:08 Anton Vorontsov
2012-05-31 1:17 ` Stephen Rothwell
2012-05-31 19:13 ` Linus Torvalds
0 siblings, 2 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-05-31 1:08 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
I guess my pull requests have a distinct style already: they are somewhat
boring (in sense that it's just a pile of fixes), late, and my gpg key is
not signed by anyone. :-)
So here it is:
The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a:
Linux 3.4-rc5 (2012-04-29 15:19:10 -0700)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.5
for you to fetch changes up to 96facd23e45e6d5020be135c8ab392ba9e044fa4:
smb347-charger: Include missing <linux/err.h> (2012-05-18 17:15:48 -0700)
----------------------------------------------------------------
A bunch of fixes for v3.5, nothing extraordinary.
----------------------------------------------------------------
Anton Vorontsov (3):
max17042_battery: Move dev_pm_ops struct under CONFIG_PM
power_supply: Make the core a boolean instead of a tristate
MAINTAINERS: Fix 'F' entry for the power supply class
Axel Lin (2):
power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry
ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE
Chanwoo Choi (2):
charger-manager: Poll battery health in normal state
charger-manager: Provide cm_notify_event function for in-kernel use
Dan Carpenter (2):
max17042_battery: Fix a couple buffer overflows
isp1704_charger: Use after free on probe error
Lee Jones (1):
ab8500: Clean up probe routines
Linus Walleij (3):
ab8500_charger: Harden platform data check
ab8500_btemp: Harden platform data check
ab8500_fg: Harden platform data check
Mika Westerberg (5):
smb347-charger: Convert to use module_i2c_driver()
smb347-charger: Rename few functions to match better what they are doing
smb347-charger: Move IRQ enabling to the end of probe
smb347-charger: Convert to regmap API
smb347-charger: Include missing <linux/err.h>
Nikolaus Voss (1):
sbs-battery.c: Capacity attr = remaining relative capacity
Ramakrishna Pallala (8):
max17042_battery: Fix driver exit function
max17042_battery: Add suspend/resume hooks
power_supply: Add voltage_ocv property and use it for max17042 driver
max17042_battery: Fix power supply and irq registration ordering
max17042_battery: Handle irq request failure case
smb347_charger: Cleanup power supply registration code in probe
max17042_battery: Add support for max17047/50 chip
smb347-charger: Clean up battery attributes
Documentation/power/charger-manager.txt | 41 +-
Documentation/power/power_supply_class.txt | 2 +
MAINTAINERS | 2 +-
drivers/power/Kconfig | 10 +-
drivers/power/ab8500_btemp.c | 12 +-
drivers/power/ab8500_charger.c | 13 +-
drivers/power/ab8500_fg.c | 12 +-
drivers/power/charger-manager.c | 392 +++++++++++++++
drivers/power/ds2781_battery.c | 20 +-
drivers/power/isp1704_charger.c | 2 +-
drivers/power/max17042_battery.c | 148 +++++-
drivers/power/power_supply_sysfs.c | 1 +
drivers/power/sbs-battery.c | 2 +-
drivers/power/smb347-charger.c | 712 +++++++++++-----------------
include/linux/power/charger-manager.h | 50 +-
include/linux/power/max17042_battery.h | 17 +
include/linux/power_supply.h | 4 +-
17 files changed, 943 insertions(+), 497 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-03-30 20:50 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-03-30 20:50 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Sorry for the delayed pull request, I hope it's too late though.
(And my gpg key is still not signed by anyone; couldn't find anyone
near me, heh.)
Anyway, here is the formal pull request:
The following changes since commit 6b21d18ed50c7d145220b0724ea7f2613abf0f95:
Linux 3.3-rc5 (2012-02-25 12:18:16 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git tags/for-v3.4-rc1
for you to fetch changes up to 5cdd4d7fa5424f2018193a0c2af3bef9036c973e:
max17042_battery: Clean up interrupt handling (2012-03-26 20:41:29 +0400)
----------------------------------------------------------------
Various small bugfixes and enhancements, plus two new drivers:
- A quite complex ab8500 charger driver, submitted by
Arun Murthy @ ST-Ericsson;
- Summit Microelectronics SMB347 Battery Charger, submitted by
Bruce E. Robertson and Alan Cox @ Intel.
And that's all.
----------------------------------------------------------------
Anton Vorontsov (9):
ab8500_charger: Convert to the new USB OTG calls
ab8500_btemp: Get rid of 'enum adc_therm'
ab8500_fg: Get rid of 'struct v_to_cap'
ab8500_fg: Get rid of 'struct battery_type'
ab8500_fg: Fix copy-paste error
ab8500: Turn unneeded global symbols into local ones
charger-manager: Simplify charger_get_property(), get rid of a warning
ab8500_fg: Fix some build warnings on x86_64
Revert "max8998_charger: Include linux/module.h just once"
Arun Murthy (4):
abx500-chargalg: Add abx500 charging algorithm
ab8500-charger: AB8500 charger driver
ab8500-fg: A8500 fuel gauge driver
ab8500-btemp: AB8500 battery temperature driver
Axel Lin (6):
da9052-battery: Add missing platform_set_drvdata
da9052-battery: Fix a memory leak when unload the module
da9052-battery: Convert to use module_platform_driver
charger-manager: Clean up for better readability
lp8727_charger: Add MODULE_DEVICE_TABLE
power_supply: Convert i2c drivers to module_i2c_driver
Bruce E. Robertson (1):
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
Dirk Brandewie (2):
max17042: Align register definitions with data sheet and init appnote
max17042: Change capacity property to use reported SOC register
Felipe Contreras (1):
isp1704_charger: Fix probe error path
Jesper Juhl (1):
max8998_charger: Include linux/module.h just once
Karol Lewandowski (2):
max17042_battery: Use devm_kzalloc() where applicable
max17042_battery: Make it possible to instantiate driver from DT
Kim, Milo (6):
lp8727_charger: Add company name and description
lp8727_charger: Add error check routine on probe()
lp8727_charger: Change i2c functions
lp8727_charger: Fix wrong code style
lp8727_charger: Add description of platform data
lp8727_charger: Correct typos on the comment
MyungJoo Ham (1):
max17042_battery: Fix CHARGE_FULL representation.
Ramakrishna Pallala (3):
max17042: Add POR init procedure from Maxim appnote
max17042: Add support for signalling change in SOC
max17042_battery: Clean up interrupt handling
.../bindings/power_supply/max17042_battery.txt | 18 +
drivers/power/Kconfig | 21 +-
drivers/power/Makefile | 2 +
drivers/power/ab8500_btemp.c | 1124 ++++++++
drivers/power/ab8500_charger.c | 2789 ++++++++++++++++++++
drivers/power/ab8500_fg.c | 2637 ++++++++++++++++++
drivers/power/abx500_chargalg.c | 1921 ++++++++++++++
drivers/power/charger-manager.c | 67 +-
drivers/power/da9052-battery.c | 15 +-
drivers/power/ds2782_battery.c | 13 +-
drivers/power/isp1704_charger.c | 1 +
drivers/power/lp8727_charger.c | 131 +-
drivers/power/max17040_battery.c | 13 +-
drivers/power/max17042_battery.c | 508 +++-
drivers/power/sbs-battery.c | 13 +-
drivers/power/smb347-charger.c | 1294 +++++++++
drivers/power/z2_battery.c | 14 +-
include/linux/lp8727.h | 18 +-
include/linux/mfd/abx500.h | 273 ++
include/linux/mfd/abx500/ab8500-bm.h | 474 ++++
include/linux/mfd/abx500/ux500_chargalg.h | 38 +
include/linux/power/max17042_battery.h | 93 +-
include/linux/power/smb347-charger.h | 117 +
23 files changed, 11388 insertions(+), 206 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/max17042_battery.txt
create mode 100644 drivers/power/ab8500_btemp.c
create mode 100644 drivers/power/ab8500_charger.c
create mode 100644 drivers/power/ab8500_fg.c
create mode 100644 drivers/power/abx500_chargalg.c
create mode 100644 drivers/power/smb347-charger.c
create mode 100644 include/linux/mfd/abx500/ab8500-bm.h
create mode 100644 include/linux/mfd/abx500/ux500_chargalg.h
create mode 100644 include/linux/power/smb347-charger.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2012-01-11 0:31 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2012-01-11 0:31 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, Tony Lindgren,
linux-kernel, Donggeun Kim, pali.rohar, kyungmin.park,
myungjoo.ham, broonie, lars, pavel, Jiri Kosina, Samuel Ortiz
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for 3.3.
Highlights:
- Now we have a full fledged charger manager, implemented by Samsung
folks. This manager monitors battery charge and health, even when
machine suspended! RTC wake-up is used to bring kernel [partially]
back to life periodically.
This new awesome charger manager, hopefully, will start replacing
bunch of proprietary charger managers that are used in embedded
devices today (e.g. BME in Nokia N900).
- New 'scope' property for power supplies. The property is used to
distinguish between system vs. devices' power supplies (think of
wireless keyboard/mice/tablet battery monitors); The support is
already implemented for Wacom and Nintendo Wiimote devices;
- National/TI LP8727 charger driver;
- Work has been started to bring drivers/power/ and ACPI SBS battery
code closer, and hopefully merge the code bases some day;
- Lots of small fixes here and there.
Note that changes that touch anything outside of driver/power were
acked by appropriate maintainers: MFD changes were acked by Samuel
Ortiz; HID changes were acked by Jiri Kosina and ARM changes were
acked by Tony Lindgren.
Thanks!
The following changes since commit caca6a03d365883564885f2c1da3e88dcf65d139:
Linux 3.2-rc3 (2011-11-23 20:20:28 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Anton Vorontsov (7):
olpc_battery: Fix section mismatch noise
olpc_battery: Remove unneeded 'olpc_battery_trigger_uevent'
Merge tag 'v3.1' from git://git.kernel.org/.../torvalds/linux.git into master
Merge branch 'power-supply-scope' of git://git.kernel.org/.../jeremy/xen
power_supply: Drop usage of nowarn variant of sysfs_create_link()
power_supply: Mark da9052 driver as broken
Merge git://git.infradead.org/users/cbou/battery-urgent
Ashish Jangam (1):
power_supply: Add DA9052 battery driver
Axel Lin (10):
max8997_charger&max8998_charger: Fix unterminated platform_device_id tables
max8903_charger: Add "platform:" prefix for platform modalias
ds2780_battery&z2_battery: Add __devexit_p at necessary places
max8998_charger: Allow full timeout not set, leave it unchanged
pda_power: Fix build error if !CONFIG_USB_OTG_UTILS
collie_battery: Convert to gpio_request_array() / gpio_free_array()
tosa_battery: Convert to gpio_request_array() / gpio_free_array()
power_supply: Convert drivers/power/* to use module_platform_driver()
wm97xx_battery: Use DEFINE_MUTEX() for work_lock
jz4740-battery: Fix signedness bug
Daniel Drake (2):
olpc_battery: Bind to device tree
olpc_battery: Add wakeup support
Dima Zavin (1):
pda_power: Add support for using otg transceiver events
Donggeun Kim (2):
power_supply: Add initial Charger-Manager driver
power_supply: Charger-Manager: Add properties for power-supply-class
Felipe Contreras (1):
isp1704_charger: Fix missing check
Heiko Stübner (1):
s3c_adc_battery: Average over more than one adc sample
Jean Delvare (1):
power_supply: Assume mains power by default
Jeremy Fitzhardinge (4):
power_supply: add SCOPE attribute to power supplies
power_supply: allow a power supply to explicitly point to powered device
power_supply: add scope properties to some self-powered HID devices
power_supply: add "powers" links to self-powered HID devices
Jochen Friedrich (1):
collie_battery: Get rid of irq_to_gpio usage
Jonghwan Choi (2):
max8997_charger: Fix unsigned value for less than zero
max8997_charger: Remove duplicate module.h
Kim, Milo (4):
lp8727_charger: Add supported i2c functionality check routine
lp8727_charger: Coding style changes
power_supply: Add "unknown" in power supply type
lp8727_charger: Add header file
Major Lee (1):
intel_mid_battery: Handle Over Current gracefully
Mark Brown (1):
wm831x_power: Only register WM831x battery charger if enabled
Milo(Woogyom) Kim (1):
lp8727_charger: Some minor fixes for the header
MyungJoo Ham (1):
max17042_battery: Bugfix of incorrect voltage register value interpretation
Olof Johansson (1):
sbs-battery: Fix devicetree match table
Pali Rohár (9):
bq27x00_battery: Do not cache current_now value for bq27000 batery
bq27x00_battery: Add support for property POWER_SUPPLY_PROP_CAPACITY_LEVEL
bq27x00_battery: Report -ENODATA if bq27000 battery was not calibrated
bq27x00_battery: Cache energy property
bq27x00_battery: Cache temperature value in converted unit
bq27x00_battery: Fix reporting status value for bq27500 battery
bq27x00_battery: Fix reporting error messages
bq27x00_battery: Fix OOPS caused by unregistring bq27x00 driver
ARM: rx51: Add bq27200 i2c board info
Paul Parsons (1):
ds2760_battery: Add rated capacity of the hx4700 3600mAh battery
Philip Rakity (9):
max17042_battery: Divide by 0 crash because r_sns init too late
max17042_battery: Do not lose accuracy calculating current_now
max8925_power: Fix incorrect voltage and current calculation
max8925_power: No temperature interrupts if temperature not connected
max8925_power: Do not detect ac insert if handled by other code
max8925_power: Remove support for irq bits that do not exist
max8925_power: Enable power change notifications
max8925_power: Do not read random data from chip registers
max8925_power: Check at probe time if power to set online
Ramakrishna Pallala (1):
max17042_battery: Fix error handling
Randy Dunlap (1):
power_supply: Fix sysfs format warning
Rhyland Klein (6):
bq20z75: Devicetree init support
bq20z75: Rename to sbs-battery
sbs-battery: Rename internals to new name
devicetree-bindings: Add vendor entry for Smart Battery Systems
devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
sbs-battery: Change power supply name
Woogyom Kim (1):
power_supply: Add LP8727 charger driver
Yong Zhang (1):
power_supply: Remove IRQF_DISABLED
.../bindings/power_supply/olpc_battery.txt | 5 +
.../bindings/power_supply/sbs_sbs-battery.txt | 23 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
Documentation/power/charger-manager.txt | 163 +++
arch/arm/mach-omap2/board-rx51-peripherals.c | 3 +
drivers/hid/hid-wacom.c | 16 +-
drivers/hid/hid-wiimote.c | 10 +-
drivers/mfd/max8925-core.c | 15 -
drivers/power/Kconfig | 32 +-
drivers/power/Makefile | 5 +-
drivers/power/bq27x00_battery.c | 210 +++--
drivers/power/charger-manager.c | 1072 ++++++++++++++++++++
drivers/power/collie_battery.c | 55 +-
drivers/power/da9030_battery.c | 13 +-
drivers/power/da9052-battery.c | 664 ++++++++++++
drivers/power/ds2760_battery.c | 19 +-
drivers/power/ds2780_battery.c | 18 +-
drivers/power/gpio-charger.c | 12 +-
drivers/power/intel_mid_battery.c | 25 +-
drivers/power/isp1704_charger.c | 14 +-
drivers/power/jz4740-battery.c | 14 +-
drivers/power/lp8727_charger.c | 494 +++++++++
drivers/power/max17042_battery.c | 94 ++-
drivers/power/max8903_charger.c | 14 +-
drivers/power/max8925_power.c | 75 +-
drivers/power/max8997_charger.c | 4 +-
drivers/power/max8998_charger.c | 14 +-
drivers/power/olpc_battery.c | 75 +-
drivers/power/pcf50633-charger.c | 12 +-
drivers/power/pda_power.c | 89 ++-
drivers/power/power_supply_core.c | 19 +-
drivers/power/power_supply_sysfs.c | 12 +-
drivers/power/s3c_adc_battery.c | 37 +-
drivers/power/{bq20z75.c => sbs-battery.c} | 481 +++++----
drivers/power/tosa_battery.c | 79 +--
drivers/power/wm831x_backup.c | 12 +-
drivers/power/wm831x_power.c | 56 +-
drivers/power/wm8350_power.c | 12 +-
drivers/power/wm97xx_battery.c | 20 +-
drivers/power/z2_battery.c | 4 +-
include/linux/lp8727.h | 51 +
include/linux/mfd/max8925.h | 7 +-
include/linux/pda_power.h | 2 +
include/linux/power/charger-manager.h | 147 +++
include/linux/power/{bq20z75.h => sbs-battery.h} | 10 +-
include/linux/power_supply.h | 11 +-
include/linux/s3c_adc_battery.h | 4 +
47 files changed, 3481 insertions(+), 743 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/sbs_sbs-battery.txt
create mode 100644 Documentation/power/charger-manager.txt
create mode 100644 drivers/power/charger-manager.c
create mode 100644 drivers/power/da9052-battery.c
create mode 100644 drivers/power/lp8727_charger.c
rename drivers/power/{bq20z75.c => sbs-battery.c} (52%)
create mode 100755 include/linux/lp8727.h
create mode 100644 include/linux/power/charger-manager.h
rename include/linux/power/{bq20z75.h => sbs-battery.h} (85%)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2011-07-31 10:40 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2011-07-31 10:40 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for
v3.1.
These are the patches that were sitting for a long time in my tree.
I have another bunch of fresh commits, but I don't want to pollute
this pull request with them. So I might do another small pull request
just after you merge this tree.
Thanks!
The following changes since commit 906649de0eacde7a643b5a0750de6207441ad54f:
PXA: Use dev_pm_ops in z2_battery (2011-05-20 19:25:11 +0400)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Axel Lin (1):
gpio-charger: Fix checking return value of request_any_context_irq
Donggeun Kim (3):
power_supply: Add charger driver for MAX8997/8966
power_supply: Add charger driver for MAX8998/LP3974
power_supply: MAX17042: Support additional properties
Grazvydas Ignotas (1):
twl4030_charger: Fix warnings
Ken O'Brien (1):
apm_power: Fix style error in macros
Mark Brown (3):
s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
wm831x_backup: Support multiple instances
wm831x_power: Support multiple instances
MyungJoo Ham (1):
max8903_charger: Allow platform data to be __initdata
Rhyland Klein (2):
bq20z75: Add support for external notification
bq20z75: Enable detection after registering
Wolfram Sang (1):
max17042_battery: Remove obsolete cleanup for clientdata
drivers/mfd/max8998.c | 2 +
drivers/power/Kconfig | 14 ++
drivers/power/Makefile | 2 +
drivers/power/apm_power.c | 8 +-
drivers/power/bq20z75.c | 103 ++++++++++++++--
drivers/power/gpio-charger.c | 2 +-
drivers/power/max17042_battery.c | 175 +++++++++++++++----------
drivers/power/max8903_charger.c | 16 ++--
drivers/power/max8997_charger.c | 206 ++++++++++++++++++++++++++++++
drivers/power/max8998_charger.c | 218 ++++++++++++++++++++++++++++++++
drivers/power/s3c_adc_battery.c | 2 +-
drivers/power/twl4030_charger.c | 10 +-
drivers/power/wm831x_backup.c | 12 ++-
drivers/power/wm831x_power.c | 26 ++++-
include/linux/mfd/max8997.h | 7 +-
include/linux/mfd/max8998.h | 12 ++
include/linux/power/bq20z75.h | 3 +
include/linux/power/max17042_battery.h | 91 +++++++++++++
18 files changed, 806 insertions(+), 103 deletions(-)
create mode 100644 drivers/power/max8997_charger.c
create mode 100644 drivers/power/max8998_charger.c
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2011-05-27 11:10 ` David Woodhouse
@ 2011-05-27 12:45 ` Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2011-05-27 12:45 UTC (permalink / raw)
To: David Woodhouse
Cc: Linus Torvalds, Andrew Morton, Stephen Rothwell, Tony Lindgren,
linux-kernel
On Fri, May 27, 2011 at 12:10:37PM +0100, David Woodhouse wrote:
> On Fri, 27 May 2011, Anton Vorontsov wrote:
> >
> > are available in the git repository at:
> > git://git.infradead.org/battery-2.6.git master
>
> Please note that git.infraded.org moved to a new IP address yesterday. And
> I stupidly forgot to update one of the nameservers, so the DNS is still
> propagating and for the next few hours you might still get the old
> address.
>
> IPv6 will be fine as it hasn't changed, but if you're stuck with Legacy IP
> and it doesn't work, make sure you have the new IP address 173.166.109.252
Thanks for the heads up!
--
Anton Vorontsov
Email: cbouatmailru@gmail.com
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL] battery-2.6.git
2011-05-27 10:54 Anton Vorontsov
@ 2011-05-27 11:10 ` David Woodhouse
2011-05-27 12:45 ` Anton Vorontsov
0 siblings, 1 reply; 27+ messages in thread
From: David Woodhouse @ 2011-05-27 11:10 UTC (permalink / raw)
To: Anton Vorontsov
Cc: Linus Torvalds, Andrew Morton, Stephen Rothwell, Tony Lindgren,
linux-kernel
On Fri, 27 May 2011, Anton Vorontsov wrote:
>
> are available in the git repository at:
> git://git.infradead.org/battery-2.6.git master
Please note that git.infraded.org moved to a new IP address yesterday. And
I stupidly forgot to update one of the nameservers, so the DNS is still
propagating and for the next few hours you might still get the old
address.
IPv6 will be fine as it hasn't changed, but if you're stuck with Legacy IP
and it doesn't work, make sure you have the new IP address 173.166.109.252
--
dwmw2
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2011-05-27 10:54 Anton Vorontsov
2011-05-27 11:10 ` David Woodhouse
0 siblings, 1 reply; 27+ messages in thread
From: Anton Vorontsov @ 2011-05-27 10:54 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, Tony Lindgren,
linux-kernel
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
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2011-03-24 14:58 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2011-03-24 14:58 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, Richard Purdie,
linux-kernel
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for
2.6.39. In general, there are just various fixes for the drivers,
most notably bq27x00 and bq20z75.
You may notice a commit that touches drivers/leds/. As Richard
Purdie (LEDs subsystem maintainer) seems no longer actively doing
kernel work, I took the patch via my tree as it is needed for some
battery stuff (additional LEDs notifications).
Thanks!
The following changes since commit 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5:
Linux 2.6.38-rc2 (2011-01-21 19:01:34 -0800)
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Anton Vorontsov (1):
Merge branch 'bq27x00-for-upstream' of git://git.metafoo.de/linux-2.6
Axel Lin (3):
bq20z75: Add MODULE_DEVICE_TABLE
ds2782_battery: Add MODULE_DEVICE_TABLE
z2_battery: Add MODULE_DEVICE_TABLE
Benson Leung (1):
bq20z75: Fix time and temp units
Grazvydas Ignotas (1):
bq27x00: Use single i2c_transfer call for property read
Heikki Krogerus (1):
twl4030_charger: Make the driver atomic notifier safe
Heiko Stuebner (1):
s3c_adc_battery: Fix method names when PM not set
Lars-Peter Clausen (11):
power_supply: Ignore -ENODATA errors when generating uevents
power_supply: Initialize changed_work before calling device_add
bq27x00: Add type property
bq27x00: Improve temperature property precession
bq27x00: Return -ENODEV for properties if the battery is not present
bq27x00: Prepare code for addition of bq27000 platform driver
bq27x00: Add bq27000 support
bq27x00: Cache battery registers
bq27x00: Poll battery state
bq27x00: Give more specific reports on battery status
bq27x00: Cleanup bq27x00_i2c_read
Pali Rohár (4):
bq27x00: Fix CURRENT_NOW property
bq27x00: Add new properties
bq27x00: Add MODULE_DEVICE_TABLE
bq27x00: Minor cleanups
Rhyland Klein (5):
bq20z75: Add support for charge properties
bq20z75: Add optional battery detect gpio
bq20z75: Add i2c retry mechanism
power_supply: Update power_supply_is_watt_property
bq20z75: Fix issues with present and suspend
Vasily Khoruzhick (3):
leds: Add ability to blink via simple trigger
power_supply: Add new LED trigger charging-blink-solid-full
z2_battery: Fix count of properties
drivers/leds/led-triggers.c | 20 +
drivers/power/Kconfig | 14 +
drivers/power/bq20z75.c | 310 ++++++++++++---
drivers/power/bq27x00_battery.c | 725 +++++++++++++++++++++++++--------
drivers/power/ds2782_battery.c | 1 +
drivers/power/power_supply_core.c | 4 +-
drivers/power/power_supply_leds.c | 19 +
drivers/power/power_supply_sysfs.c | 2 +-
drivers/power/s3c_adc_battery.c | 4 +-
drivers/power/twl4030_charger.c | 25 +-
drivers/power/z2_battery.c | 3 +
include/linux/leds.h | 3 +
include/linux/power/bq20z75.h | 39 ++
include/linux/power/bq27x00_battery.h | 19 +
include/linux/power_supply.h | 47 +++
15 files changed, 1009 insertions(+), 226 deletions(-)
create mode 100644 include/linux/power/bq20z75.h
create mode 100644 include/linux/power/bq27x00_battery.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2011-01-14 15:43 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2011-01-14 15:43 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for
2.6.38. Two new drivers plus some assorted cleanups and bug fixes
in this pull request.
Thanks!
The following changes since commit e53beacd23d9cb47590da6a7a7f6d417b941a994:
Linus Torvalds (1):
Linux 2.6.37-rc2
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Ameya Palande (1):
isp1704_charger: Correct length for storing model
Anton Vorontsov (1):
jz4740-battery: Should include linux/io.h
Daniel Drake (1):
olpc_battery: Ambient temperature is not available on XO-1.5
Heikki Krogerus (3):
isp1704_charger: Detect HUB/Host chargers
isp1704_charger: Set isp->dev before anything needs it
isp1704_charger: Detect charger after probe
Lars-Peter Clausen (6):
jz4740-battery: Protect against concurrent battery readings
power_supply: Add gpio charger driver
jz4740-battery: Check if platform_data is supplied
gpio-charger: Check result of kzalloc
gpio-charger: Provide default name for the power_supply
gpio-charger: Fix potential race between irq handler and probe/remove
MyungJoo Ham (1):
power_supply: Add MAX17042 Fuel Gauge Driver
Sascha Silbe (4):
olpc_battery: Add support for CHARGE_FULL_DESIGN
olpc_battery: Add support for CHARGE_NOW
olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW
olpc_battery: Fix up XO-1.5 properties list
Sven Neumann (1):
ds2760_battery: Fix calculation of time_to_empty_now
Tejun Heo (1):
power_supply: Don't use flush_scheduled_work()
Vasiliy Kulikov (1):
power_supply: Fix use after free and memory leak
Vasily Khoruzhick (1):
s3c_adc_battery: Add gpio_inverted field to pdata
drivers/power/Kconfig | 20 +++
drivers/power/Makefile | 2 +
drivers/power/collie_battery.c | 13 +-
drivers/power/ds2760_battery.c | 2 +-
drivers/power/gpio-charger.c | 188 +++++++++++++++++++++++++
drivers/power/intel_mid_battery.c | 2 +-
drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++------
drivers/power/jz4740-battery.c | 13 ++
drivers/power/max17042_battery.c | 239 ++++++++++++++++++++++++++++++++
drivers/power/olpc_battery.c | 114 +++++++++++++++-
drivers/power/power_supply_core.c | 6 +-
drivers/power/s3c_adc_battery.c | 12 ++-
drivers/power/tosa_battery.c | 13 +-
drivers/power/wm97xx_battery.c | 4 +-
drivers/power/z2_battery.c | 6 +-
include/linux/power/gpio-charger.h | 41 ++++++
include/linux/power/max17042_battery.h | 30 ++++
include/linux/s3c_adc_battery.h | 1 +
18 files changed, 838 insertions(+), 69 deletions(-)
create mode 100644 drivers/power/gpio-charger.c
create mode 100644 drivers/power/max17042_battery.c
create mode 100644 include/linux/power/gpio-charger.h
create mode 100644 include/linux/power/max17042_battery.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2010-10-26 14:41 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2010-10-26 14:41 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, Tony Lindgren,
linux-kernel
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared for
2.6.37.
There are three new drivers, various small cleanups and bug fixes.
You may notice the arch/arm/ change for Nokia N900 board, though
it has an appropriate ack from the OMAP maintainer to go through
the battery tree.
Thanks!
The following changes since commit 763008c4357b73c8d18396dfd8d79dc58fa3f99d:
Linus Torvalds (1):
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Axel Lin (5):
pcf50633-charger: Add missing sysfs_remove_group()
ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()
jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()
wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()
bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()
Grazvydas Ignotas (1):
power_supply: Add driver for TWL4030/TPS65950 BCI charger
Heikki Krogerus (4):
power_supply: Add isp1704 charger detection driver
omap: rx51: Add support for USB chargers
power_supply: Add types for USB chargers
power_supply: Introduce maximum current property
Ian Lartey (1):
wm831x_power: Remove duplicate chg mask
Martin Schwidefsky (1):
ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency
Rhyland Klein (2):
power_supply: Add driver for TI BQ20Z75 gas gauge IC
bq20z75: Add support for more power supply properties
Richard A. Smith (1):
olpc_battery: Fix endian neutral breakage for s16 values
Ryan Mallon (1):
ds2782_battery: Fix units
matt mooney (1):
power_supply: Makefile cleanup
arch/arm/mach-omap2/board-rx51-peripherals.c | 5 +
drivers/power/Kconfig | 23 +-
drivers/power/Makefile | 19 +-
drivers/power/bq20z75.c | 493 ++++++++++++++++++++++
drivers/power/bq27x00_battery.c | 1 +
drivers/power/ds2760_battery.c | 1 +
drivers/power/ds2782_battery.c | 12 +-
drivers/power/isp1704_charger.c | 369 +++++++++++++++++
drivers/power/jz4740-battery.c | 1 +
drivers/power/olpc_battery.c | 8 +-
drivers/power/pcf50633-charger.c | 1 +
drivers/power/power_supply_sysfs.c | 4 +-
drivers/power/twl4030_charger.c | 565 ++++++++++++++++++++++++++
drivers/power/wm831x_power.c | 2 +-
include/linux/power_supply.h | 6 +-
15 files changed, 1483 insertions(+), 27 deletions(-)
create mode 100644 drivers/power/bq20z75.c
create mode 100644 drivers/power/isp1704_charger.c
create mode 100644 drivers/power/twl4030_charger.c
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
@ 2010-08-11 5:17 Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2010-08-11 5:17 UTC (permalink / raw)
To: Linus Torvalds
Cc: Andrew Morton, David Woodhouse, Stephen Rothwell, linux-kernel
Hello Linus,
Please pull battery-2.6.git tree to receive changes prepared
for 2.6.36.
Thanks!
The following changes since commit eb9650d6d989f24f21232a055d8fd45f1a9dcf99:
Peter Huewe (1):
ds2782_battery: Rename get_current to fix build failure / name conflict
are available in the git repository at:
git://git.infradead.org/battery-2.6.git master
Alan Cox (1):
intel_mid_battery: Fix battery scaling
Arjan van de Ven (1):
intel_mid_battery: Fix the argument order to intel_scu_ipc_command
David Woodhouse (1):
olpc_battery: Fix build failure caused by sysfs changes
Nithish Mahalingam (1):
Intel MID platform battery driver
Vasily Khoruzhick (1):
Add s3c-adc-battery driver
drivers/power/Kconfig | 13 +
drivers/power/Makefile | 2 +
drivers/power/intel_mid_battery.c | 799 +++++++++++++++++++++++++++++++++++++
drivers/power/olpc_battery.c | 3 +-
drivers/power/s3c_adc_battery.c | 431 ++++++++++++++++++++
include/linux/s3c_adc_battery.h | 36 ++
6 files changed, 1282 insertions(+), 2 deletions(-)
create mode 100644 drivers/power/intel_mid_battery.c
create mode 100644 drivers/power/s3c_adc_battery.c
create mode 100644 include/linux/s3c_adc_battery.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL] battery-2.6.git
2010-05-25 7:08 ` Daniel Mack
@ 2010-05-25 10:27 ` Anton Vorontsov
0 siblings, 0 replies; 27+ messages in thread
From: Anton Vorontsov @ 2010-05-25 10:27 UTC (permalink / raw)
To: Linus Torvalds
Cc: Rafael J. Wysocki, Greg KH, Kay Sievers, LKML, Andrew Morton,
Maciej Rutecki, Daniel Mack
Hello Linus,
Please pull from
git://git.infradead.org/battery-2.6.git master
to receive a fixup for regression reported by Rafael J. Wysocki
http://lkml.org/lkml/2010/5/24/273
Thanks!
commit bbabb158f0e9d41174ae5c2183a8e4f981daf6ce
Author: Daniel Mack <daniel@caiaq.de>
Date: Tue May 25 02:39:45 2010 +0200
power_supply: Fix regression for 'type' property
Commit 5f487cd34f4337f9bc27ca19da72a39d1b0a0ab4 (power_supply: Use
attribute groups) causes a regression the power supply core does not
export the 'type' attribute anymore.
POWER_SUPPLY_PROP_TYPE is handled by the power supply core without the
low-level driver, so power_supply_attr_is_visible() must always return
the entry as readable.
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Tested-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 6a86cdf..9d30eeb 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -179,14 +179,16 @@ static mode_t power_supply_attr_is_visible(struct kobject *kobj,
{
struct device *dev = container_of(kobj, struct device, kobj);
struct power_supply *psy = dev_get_drvdata(dev);
+ mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
int i;
+ if (attrno == POWER_SUPPLY_PROP_TYPE)
+ return mode;
+
for (i = 0; i < psy->num_properties; i++) {
int property = psy->properties[i];
if (property == attrno) {
- mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
-
if (psy->property_is_writeable &&
psy->property_is_writeable(psy, property) > 0)
mode |= S_IWUSR;
^ permalink raw reply related [flat|nested] 27+ messages in thread
end of thread, other threads:[~2014-01-21 17:54 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-11 5:24 [GIT PULL] battery-2.6.git Anton Vorontsov
-- strict thread matches above, loose matches on Subject: below --
2014-01-21 17:54 Dmitry Eremin-Solenikov
2014-01-03 9:27 Anton Vorontsov
2013-11-18 2:08 Anton Vorontsov
2013-07-09 1:39 Anton Vorontsov
2013-05-25 22:23 Anton Vorontsov
2013-05-25 23:23 ` David Woodhouse
2013-05-25 22:39 ` Anton Vorontsov
2013-04-30 5:14 Anton Vorontsov
2013-02-19 7:09 Anton Vorontsov
2012-12-12 10:22 Anton Vorontsov
2012-10-05 3:04 Anton Vorontsov
2012-07-31 13:05 Anton Vorontsov
2012-05-31 1:08 Anton Vorontsov
2012-05-31 1:17 ` Stephen Rothwell
2012-05-31 19:13 ` Linus Torvalds
2012-03-30 20:50 Anton Vorontsov
2012-01-11 0:31 Anton Vorontsov
2011-07-31 10:40 Anton Vorontsov
2011-05-27 10:54 Anton Vorontsov
2011-05-27 11:10 ` David Woodhouse
2011-05-27 12:45 ` Anton Vorontsov
2011-03-24 14:58 Anton Vorontsov
2011-01-14 15:43 Anton Vorontsov
2010-10-26 14:41 Anton Vorontsov
2010-08-11 5:17 Anton Vorontsov
2010-05-24 22:28 [Regression] Commit "power_supply: Use attribute groups" breaks KDE battery monitor on openSUSE 11.3 M6 Rafael J. Wysocki
2010-05-25 0:20 ` Rafael J. Wysocki
2010-05-25 0:47 ` Daniel Mack
2010-05-25 0:55 ` Rafael J. Wysocki
2010-05-25 7:08 ` Daniel Mack
2010-05-25 10:27 ` [GIT PULL] battery-2.6.git Anton Vorontsov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.