Commit 5a69e9bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:
 "battery/charger driver changes:
   - core:
      - provide function stubs if CONFIG_POWER_SUPPLY=n
      - reduce loglevel for probe defer info
   - surface:
      - new battery and charger drivers for Surface
   - bq27xxx:
      - add bq78z100 support
      - fix current_now/power_avg for newer chips
   - cw2015:
      - add CHARGE_NOW support
   - ab8500:
      - drop pdata support
   - convert most DT bindings to YAML
   - lots of minor fixes and cleanups

  reset drivers:
   - ltc2952-poweroff:
      - make trigger delay configurable from DT
   - minor fixes and cleanups"

* tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (97 commits)
  power: supply: cpcap-battery: fix invalid usage of list cursor
  power: supply: bq256xx: add kerneldoc for structure members
  power: supply: act8945a: correct kerneldoc
  power: supply: max17040: remove unneeded double cast
  power: supply: max17040: handle device_property_read_u8_array() failure
  power: supply: max14577: remove unneeded variable initialization
  power: supply: surface-charger: Make symbol 'surface_ac_pm_ops' static
  power: supply: surface-battery: Make some symbols static
  power: reset: restart-poweroff: Add missing MODULE_DEVICE_TABLE
  power: reset: hisi-reboot: add missing MODULE_DEVICE_TABLE
  power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
  power: supply: generic-adc-battery: fix possible use-after-free in gab_remove()
  power: supply: Add AC driver for Surface Aggregator Module
  power: supply: Add battery driver for Surface Aggregator Module
  power: supply: bq25980: Move props from battery node
  power: supply: core: Use true and false for bool variable
  power: supply: goldfish: Remove the GOLDFISH dependency
  power: reset: ltc2952: make trigger delay configurable
  power: supply: cpcap-charger: Simplify bool conversion
  power: supply: cpcap-charger: Add usleep to cpcap charger to avoid usb plug bounce
  ...
parents a8b5e037 d0a43c12

Documentation/ABI/testing/sysfs-class-power-surface

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/class/power_supply/<supply_name>/alarm

Date:		April 2021

KernelVersion:	5.13

Contact:	Maximilian Luz <luzmaximilian@gmail.com>

Description:

		Battery trip point. When the remaining battery capacity crosses this

		value in either direction, the system will be notified and if

		necessary woken.



		Set to zero to clear/disable.



		Access: Read, Write



		Valid values: In micro-Wh or micro-Ah, depending on the power unit

		of the battery

Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ Optional properties: 
			chip's trigger line. If this property is not set, the

			trigger function is ignored and the chip is kept alive

			until an explicit kill signal is received

- trigger-delay-ms	The number of milliseconds to wait after trigger line

			assertion before executing shut down procedure.

			The default is 2500ms.



Example:
@@ -24,6 +27,7 @@ ltc2952 { 
	compatible = "lltc,ltc2952";



	trigger-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;

	trigger-delay-ms = <2000>;

	watchdog-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

	kill-gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

};

Documentation/devicetree/bindings/power/supply/ab8500/btemp.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
=== AB8500 Battery Temperature Monitor Driver ===



The properties below describes the node for btemp driver.



Required Properties:

- compatible = Shall be: "stericsson,ab8500-btemp"

- battery = Shall be battery specific information



	Example:

	ab8500_btemp {

		compatible = "stericsson,ab8500-btemp";

		battery	   = <&ab8500_battery>;

	};



For information on battery specific node, Ref:

Documentation/devicetree/bindings/power/supply/ab8500/fg.txt

Documentation/devicetree/bindings/power/supply/ab8500/chargalg.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
=== AB8500 Charging Algorithm Driver ===



The properties below describes the node for chargalg driver.



Required Properties:

- compatible = Shall be: "stericsson,ab8500-chargalg"

- battery = Shall be battery specific information



Example:

ab8500_chargalg {

	compatible = "stericsson,ab8500-chargalg";

	battery	   = <&ab8500_battery>;

};



For information on battery specific node, Ref:

Documentation/devicetree/bindings/power/supply/ab8500/fg.txt

Documentation/devicetree/bindings/power/supply/ab8500/charger.txt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
=== AB8500 Charger Driver ===



Required Properties:

- compatible = Shall be "stericsson,ab8500-charger"

- battery = Shall be battery specific information

	Example:

	ab8500_charger {

		compatible = "stericsson,ab8500-charger";

		battery	   = <&ab8500_battery>;

	};



- vddadc-supply: Supply for USB and Main charger

	Example:

	ab8500-charger {

		vddadc-supply	= <&ab8500_ldo_tvout_reg>;

	}

- autopower_cfg:

	Boolean value depicting the presence of 'automatic poweron after powerloss'

	Example:

	ab8500-charger {

		autopower_cfg;

	};



For information on battery specific node, Ref:

Documentation/devicetree/bindings/power/supply/ab8500/fg.txt