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

Pull battery subsystem updates from Anton Vorontsov:
 "Highlights:

   - 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."

* tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
  max8925_power: Add support for device-tree initialization
  ab8500: Add devicetree support for chargalg
  ab8500: Add devicetree support for charger
  ab8500: Add devicetree support for btemp
  ab8500: Add devicetree support for fuelgauge
  twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
  jz4740-battery: Use devm_request_and_ioremap
  jz4740-battery: Use devm_kzalloc
  bq27x00_battery: Fixup nominal available capacity reporting
  bq2415x_charger: Fix style issues
  bq2415x_charger: Add Kconfig/Makefile entries
  power_supply: Add bq2415x charger driver
  power_supply: Add new Nokia RX-51 (N900) power supply battery driver
  max17042_battery: Fix missing verify_model_lock() return value check
  ds2782_battery: Fix signedness bug in ds278x_read_reg16()
  lp8788-charger: Fix ADC channel names
  lp8788-charger: Fix wrong ADC conversion
  lp8788-charger: Use consumer device name on setting IIO channels
  power_supply: Register power supply for thermal cooling device
  power_supply: Add support for CHARGE_CONTROL_* attributes
  ...

1 files changed, 17 insertions, 7 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index b1d956d81f0c..9f45e2f77d53 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -245,6 +245,13 @@ config BATTERY_INTEL_MID
           Say Y here to enable the battery driver on Intel MID
           platforms.
 
+config BATTERY_RX51
+        tristate "Nokia RX-51 (N900) battery driver"
+        depends on TWL4030_MADC
+        help
+          Say Y here to enable support for battery information on Nokia
+          RX-51, also known as N900 tablet.
+
 config CHARGER_ISP1704
         tristate "ISP1704 USB Charger Detection"
         depends on USB_OTG_UTILS
@@ -315,6 +322,16 @@ config CHARGER_MAX8998
           Say Y to enable support for the battery charger control sysfs and
           platform data of MAX8998/LP3974 PMICs.
 
+config CHARGER_BQ2415X
+        tristate "TI BQ2415x battery charger driver"
+        depends on I2C
+        help
+          Say Y to enable support for the TI BQ2415x battery charger
+          PMICs.
+
+          You'll need this driver to charge batteries on e.g. Nokia
+          RX-51/N900.
+
 config CHARGER_SMB347
         tristate "Summit Microelectronics SMB347 Battery Charger"
         depends on I2C
@@ -329,13 +346,6 @@ config AB8500_BM
         help
           Say Y to include support for AB8500 battery management.
 
-config AB8500_BATTERY_THERM_ON_BATCTRL
-        bool "Thermistor connected on BATCTRL ADC"
-        depends on AB8500_BM
-        help
-          Say Y to enable battery temperature measurements using
-          thermistor connected on BATCTRL ADC.
-
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY