Commit 4cadc60d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply and reset updates from Sebastian Reichel:
 "Core:
   - Add battery internal resistance temperature table support

  Drivers:
   - sc27xx: Optimize the battery resistance with measuring temperature
   - max17042-battery: Add MAX17055 support
   - bq25890-charger: Add support of BQ25892 and BQ25896 chips
   - misc fixes"

* tag 'for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (44 commits)
  power: supply: ipaq_micro_battery: remove unneeded semicolon
  power: supply: bq25890_charger: fix incorrect error return when bq25890_field_read fails
  power: supply: axp20x_usb_power: Only poll while offline
  power: supply: axp20x_usb_power: Add wakeup control
  power: supply: axp20x_usb_power: Allow offlining
  power: supply: axp20x_usb_power: Use a match structure
  power: suppy: ucs1002: Make the symbol 'ucs1002_regulator_enable' static
  power: reset: at91-poweroff: use proper master clock register offset
  power: reset: at91-poweroff: introduce struct shdwc_reg_config
  power: supply: bq25890_charger: Add DT and I2C ids for all supported chips
  dt-bindings: Add new chips to bq25890 binding documentation
  power: supply: bq25890_charger: Add support of BQ25892 and BQ25896 chips
  power: supply: core: Update sysfs-class-power ABI document
  power: supply: sbs-battery: Fix a signedness bug in sbs_get_battery_capacity()
  power: supply: ltc2941-battery-gauge: fix use-after-free
  power: supply: max17040: Correct IRQ wake handling
  power: supply: axp20x_usb_power: Remove unused device_node
  power: supply: axp20x_ac_power: Add wakeup control
  power: supply: axp20x_ac_power: Allow offlining
  power: supply: axp20x_ac_power: Fix reporting online status
  ...
parents 893e591b 3d32a843

Documentation/ABI/testing/sysfs-class-power

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ Description: 
		Access: Read

		Valid values: "Unknown", "Good", "Overheat", "Dead",

			      "Over voltage", "Unspecified failure", "Cold",

			      "Watchdog timer expire", "Safety timer expire"

			      "Watchdog timer expire", "Safety timer expire",

			      "Over current"



What:		/sys/class/power_supply/<supply_name>/precharge_current

Date:		June 2017

Documentation/devicetree/bindings/power/supply/battery.txt

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ Optional Properties: 
   for each of the battery capacity lookup table. The first temperature value

   specifies the OCV table 0, and the second temperature value specifies the

   OCV table 1, and so on.

 - resistance-temp-table: An array providing the temperature in degree Celsius

   and corresponding battery internal resistance percent, which is used to look

   up the resistance percent according to current temperature to get a accurate

   batterty internal resistance in different temperatures.



Battery properties are named, where possible, for the corresponding

elements in enum power_supply_property, defined in
@@ -61,6 +65,7 @@ Example: 
		ocv-capacity-table-0 = <4185000 100>, <4113000 95>, <4066000 90>, ...;

		ocv-capacity-table-1 = <4200000 100>, <4185000 95>, <4113000 90>, ...;

		ocv-capacity-table-2 = <4250000 100>, <4200000 95>, <4185000 90>, ...;

		resistance-temp-table = <20 100>, <10 90>, <0 80>, <(-10) 60>;

	};



	charger: charger@11 {

Documentation/devicetree/bindings/power/supply/bq25890.txt

+5 −2
Original line number Diff line number Diff line 
Binding for TI bq25890 Li-Ion Charger



This driver will support the bq25896 and the bq25890. There are other ICs

in the same family but those have not been tested.

This driver will support the bq25892, the bq25896 and the bq25890. There are

other ICs in the same family but those have not been tested.



Required properties:

- compatible: Should contain one of the following:

    * "ti,bq25890"

    * "ti,bq25892"

    * "ti,bq25895"

    * "ti,bq25896"

- reg: integer, i2c address of the device.

- ti,battery-regulation-voltage: integer, maximum charging voltage (in uV);

- ti,charge-current: integer, maximum charging current (in uA);

Documentation/devicetree/bindings/power/supply/max17040_battery.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
max17040_battery

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



Required properties :

 - compatible : "maxim,max17040" or "maxim,max77836-battery"

 - reg: i2c slave address



Optional properties :

- maxim,alert-low-soc-level :	The alert threshold that sets the state of

				charge level (%) where an interrupt is

				generated. Can be configured from 1 up to 32

				(%). If skipped the power up default value of

				4 (%) will be used.

- interrupts : 			Interrupt line see Documentation/devicetree/

				bindings/interrupt-controller/interrupts.txt

- wakeup-source :		This device has wakeup capabilities. Use this

				property to use alert low SOC level interrupt

				as wake up source.



Optional properties support interrupt functionality for alert low state of

charge level, present in some ICs in the same family, and should be used with

compatible "maxim,max77836-battery".



Example:



	battery-fuel-gauge@36 {

		compatible = "maxim,max77836-battery";

		reg = <0x36>;

		maxim,alert-low-soc-level = <10>;

		interrupt-parent = <&gpio7>;

		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;

		wakeup-source;

	};

Documentation/devicetree/bindings/power/supply/max17042_battery.txt

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ max17042_battery 
~~~~~~~~~~~~~~~~



Required properties :

 - compatible : "maxim,max17042"

 - compatible : one of the following

 * "maxim,max17042"

 * "maxim,max17047"

 * "maxim,max17050"

 * "maxim,max17055"



Optional properties :

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE