Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919c8401 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6 

Pull battery updates from Anton Vorontsov:
 "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."

* tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6: (36 commits)
  max17042_battery: Clean up interrupt handling
  Revert "max8998_charger: Include linux/module.h just once"
  ab8500_fg: Fix some build warnings on x86_64
  max17042_battery: Fix CHARGE_FULL representation.
  max8998_charger: Include linux/module.h just once
  power_supply: Convert i2c drivers to module_i2c_driver
  lp8727_charger: Add MODULE_DEVICE_TABLE
  charger-manager: Simplify charger_get_property(), get rid of a warning
  charger-manager: Clean up for better readability
  da9052-battery: Convert to use module_platform_driver
  da9052-battery: Fix a memory leak when unload the module
  da9052-battery: Add missing platform_set_drvdata
  ab8500: Turn unneeded global symbols into local ones
  ab8500_fg: Fix copy-paste error
  ab8500_fg: Get rid of 'struct battery_type'
  ab8500_fg: Get rid of 'struct v_to_cap'
  ab8500_btemp: Get rid of 'enum adc_therm'
  ab8500_charger: Convert to the new USB OTG calls
  ab8500-btemp: AB8500 battery temperature driver
  ab8500-fg: A8500 fuel gauge driver
  ...
parents a9d38a4f 5cdd4d7f

Documentation/devicetree/bindings/power_supply/max17042_battery.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
max17042_battery

~~~~~~~~~~~~~~~~



Required properties :

 - compatible : "maxim,max17042"



Optional properties :

 - maxim,rsns-microohm : Resistance of rsns resistor in micro Ohms

                         (datasheet-recommended value is 10000).

   Defining this property enables current-sense functionality.



Example:



	battery-charger@36 {

		compatible = "maxim,max17042";

		reg = <0x36>;

		maxim,rsns-microohm = <10000>;

	};

drivers/power/Kconfig

+20 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ config CHARGER_TWL4030 
	  Say Y here to enable support for TWL4030 Battery Charge Interface.



config CHARGER_LP8727

	tristate "National Semiconductor LP8727 charger driver"

	tristate "TI/National Semiconductor LP8727 charger driver"

	depends on I2C

	help

	  Say Y here to enable support for LP8727 Charger Driver.
@@ -288,4 +288,23 @@ config CHARGER_MAX8998 
	  Say Y to enable support for the battery charger control sysfs and

	  platform data of MAX8998/LP3974 PMICs.



config CHARGER_SMB347

	tristate "Summit Microelectronics SMB347 Battery Charger"

	depends on I2C

	help

	  Say Y to include support for Summit Microelectronics SMB347

	  Battery Charger.



config AB8500_BM

	bool "AB8500 Battery Management Driver"

	depends on AB8500_CORE && AB8500_GPADC

	help

	  Say Y to include support for AB5500 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.

endif # POWER_SUPPLY

drivers/power/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o 
obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o

obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o

obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o

obj-$(CONFIG_AB8500_BM)		+= ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o

obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o

obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o

obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
@@ -42,3 +43,4 @@ obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o 
obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o

obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o

obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o

obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o

drivers/power/ab8500_btemp.c

0 → 100644
+1124 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/power/ab8500_charger.c

0 → 100644
+2789 −0

File added.

Preview size limit exceeded, changes collapsed.