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

Commit a709bd58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull battery updates from Anton Vorontsov:
 "Highlights:
   - A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia.
   - Device tree bindings for TWL4030 chips.
   - Random fixes and cleanups"

* tag 'for-v3.13' of git://git.infradead.org/battery-2.6:
  pm2301-charger: Remove unneeded NULL checks
  twl4030_charger: Add devicetree support
  power_supply: Fix documentation for TEMP_*ALERT* properties
  max17042_battery: Support regmap to access device's registers
  max17042_battery: Use SIMPLE_DEV_PM_OPS
  charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code
  bq2415x_charger: Fix max battery regulation voltage
  tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code
  tps65090-charger: Drop devm_free_irq of devm_ allocated irq
  power_supply: Add support for bq24735 charger
  pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt
  pm2301-charger: Check return value of regulator_enable
  ab8500-charger: Remove redundant break
  ab8500-charger: Check return value of regulator_enable
  isp1704_charger: Fix driver to work with changes introduced in v3.5
parents 3ea369ee c8024234

Documentation/devicetree/bindings/power/twl-charger.txt

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
TWL BCI (Battery Charger Interface)



Required properties:

- compatible:

  - "ti,twl4030-bci"

- interrupts: two interrupt lines from the TWL SIH (secondary

  interrupt handler) - interrupts 9 and 2.



Optional properties:

- ti,bb-uvolt: microvolts for charging the backup battery.

- ti,bb-uamp: microamps for charging the backup battery.



Examples:



bci {

   compatible = "ti,twl4030-bci";

   interrupts = <9>, <2>;

   ti,bb-uvolt = <3200000>;

   ti,bb-uamp = <150>;

};

Documentation/devicetree/bindings/power_supply/ti,bq24735.txt

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
TI BQ24735 Charge Controller

~~~~~~~~~~



Required properties :

 - compatible : "ti,bq24735"



Optional properties :

 - interrupts : Specify the interrupt to be used to trigger when the AC

   adapter is either plugged in or removed.

 - ti,ac-detect-gpios : This GPIO is optionally used to read the AC adapter

   presence. This is a Host GPIO that is configured as an input and

   connected to the bq24735.

 - ti,charge-current : Used to control and set the charging current. This value

   must be between 128mA and 8.128A with a 64mA step resolution. The POR value

   is 0x0000h. This number is in mA (e.g. 8192), see spec for more information

   about the ChargeCurrent (0x14h) register.

 - ti,charge-voltage : Used to control and set the charging voltage. This value

   must be between 1.024V and 19.2V with a 16mV step resolution. The POR value

   is 0x0000h. This number is in mV (e.g. 19200), see spec for more information

   about the ChargeVoltage (0x15h) register.

 - ti,input-current : Used to control and set the charger input current. This

   value must be between 128mA and 8.064A with a 128mA step resolution. The

   POR value is 0x1000h. This number is in mA (e.g. 8064), see the spec for

   more information about the InputCurrent (0x3fh) register.



Example:



	bq24735@9 {

		compatible = "ti,bq24735";

		reg = <0x9>;

		ti,ac-detect-gpios = <&gpio 72 0x1>;

	}

Documentation/power/power_supply_class.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -135,11 +135,11 @@ CAPACITY_LEVEL - capacity level. This corresponds to 
POWER_SUPPLY_CAPACITY_LEVEL_*.

POWER_SUPPLY_CAPACITY_LEVEL_*.





TEMP - temperature of the power supply.

TEMP - temperature of the power supply.

TEMP_ALERT_MIN - minimum battery temperature alert value in milli centigrade.

TEMP_ALERT_MIN - minimum battery temperature alert.

TEMP_ALERT_MAX - maximum battery temperature alert value in milli centigrade.

TEMP_ALERT_MAX - maximum battery temperature alert.

TEMP_AMBIENT - ambient temperature.

TEMP_AMBIENT - ambient temperature.

TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert value in milli centigrade.

TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert.

TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert value in milli centigrade.

TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert.





TIME_TO_EMPTY - seconds left for battery to be considered empty (i.e.

TIME_TO_EMPTY - seconds left for battery to be considered empty (i.e.

while battery powers a load)

while battery powers a load)

arch/arm/boot/dts/twl4030.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,12 @@ 
		interrupts = <11>;

		interrupts = <11>;

	};

	};





	charger: bci {

		compatible = "ti,twl4030-bci";

		interrupts = <9>, <2>;

		bci3v1-supply = <&vusb3v1>;

	};



	watchdog {

	watchdog {

		compatible = "ti,twl4030-wdt";

		compatible = "ti,twl4030-wdt";

	};

	};

drivers/power/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -346,6 +346,12 @@ config CHARGER_BQ24190 
	help

	help

	  Say Y to enable support for the TI BQ24190 battery charger.

	  Say Y to enable support for the TI BQ24190 battery charger.





config CHARGER_BQ24735

	tristate "TI BQ24735 battery charger support"

	depends on I2C && GPIOLIB

	help

	  Say Y to enable support for the TI BQ24735 battery charger.



config CHARGER_SMB347

config CHARGER_SMB347

	tristate "Summit Microelectronics SMB347 Battery Charger"

	tristate "Summit Microelectronics SMB347 Battery Charger"

	depends on I2C

	depends on I2C