linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anton Vorontsov <cbouatmailru@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Andrew Morton" <akpm@linux-foundation.org>,
	"David Woodhouse" <dwmw2@infradead.org>,
	"Stephen Rothwell" <sfr@canb.auug.org.au>,
	linux-kernel@vger.kernel.org, "Pali Rohár" <pali.rohar@gmail.com>,
	"Ramakrishna Pallala" <ramakrishna.pallala@intel.com>
Subject: [GIT PULL] battery-2.6.git
Date: Wed, 12 Dec 2012 02:22:07 -0800	[thread overview]
Message-ID: <20121212102206.GA13858@lizard> (raw)

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

             reply	other threads:[~2012-12-12 10:25 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-12 10:22 Anton Vorontsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-01-21 17:54 [GIT PULL] battery-2.6.git Dmitry Eremin-Solenikov
2014-01-03  9:27 Anton Vorontsov
2013-11-18  2:08 Anton Vorontsov
2013-09-11  5:24 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-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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121212102206.GA13858@lizard \
    --to=cbouatmailru@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pali.rohar@gmail.com \
    --cc=ramakrishna.pallala@intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).