From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Dec 2012 03:26:04 +0000 (-0800)
Subject: Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6
X-Git-Tag: v3.8~326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7313264b899bbf3988841296265a6e0e8a7b6521;p=platform%2Fkernel%2Flinux-amlogic.git

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

7313264b899bbf3988841296265a6e0e8a7b6521
diff --cc drivers/power/Kconfig
index b1d956d,263499f..9f45e2f
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -329,15 -346,6 +346,8 @@@ config AB8500_B
  	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
  
  source "drivers/power/avs/Kconfig"
diff --cc drivers/power/Makefile
index f1d99f4,696e3a9..22c8913
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@@ -47,6 -48,6 +48,7 @@@ obj-$(CONFIG_CHARGER_GPIO)	+= gpio-char
  obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
  obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
  obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o
+ obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o
  obj-$(CONFIG_POWER_AVS)		+= avs/
  obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o
 +obj-$(CONFIG_POWER_RESET)	+= reset/