Commit 8eb48fc7 authored Mar 25, 2022 by Linus Torvalds

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

Pull power supply and reset updates from Sebastian Reichel:
 "Power-supply core:

   - Introduce "Bypass" charging type used by USB PPS standard

   - Refactor power_supply_set_input_current_limit_from_supplier()

   - Add fwnode support to power_supply_get_battery_info()

  Drivers:

   - ab8500: continue migrating towards using standard core APIs

   - axp288 fuel-gauge: refactor driver to be fully resource managed

   - battery-samsung-sdi: new in-kernel provider for (constant) Samsung
     battery info

   - bq24190: disable boost regulator on shutdown

   - bq24190: add support for battery-info on ACPI based systems

   - bq25890: prepare driver for usage on ACPI based systems

   - bq25890: add boost regulator support

   - cpcap-battery: add NVMEM based battery detection support

   - injoinic ip5xxx: new driver for power bank IC

   - upi ug3105: new battery driver

   - misc small improvements and fixes"

* tag 'for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (94 commits)
  power: ab8500_chargalg: Use CLOCK_MONOTONIC
  power: supply: Add a driver for Injoinic power bank ICs
  dt-bindings: trivial-devices: Add Injoinic power bank ICs
  dt-bindings: vendor-prefixes: Add Injoinic
  power: supply: ab8500: Remove unused variable
  power: supply: da9150-fg: Remove unnecessary print function dev_err()
  power: supply: ab8500: fix a handful of spelling mistakes
  power: supply: ab8500_fg: Account for line impedance
  dt-bindings: power: supply: ab8500_fg: Add line impedance
  power: supply: axp20x_usb_power: fix platform_get_irq.cocci warnings
  power: supply: axp20x_ac_power: fix platform_get_irq.cocci warning
  power: supply: wm8350-power: Add missing free in free_charger_irq
  power: supply: wm8350-power: Handle error for wm8350_register_irq
  power: supply: Static data for Samsung batteries
  power: supply: ab8500_fg: Use VBAT-to-Ri if possible
  power: supply: Support VBAT-to-Ri lookup tables
  power: supply: ab8500: Standardize BTI resistance
  power: supply: ab8500: Standardize alert mode charging
  power: supply: ab8500: Standardize maintenance charging
  power: supply: bq24190_charger: Delay applying charge_type changes when OTG 5V Vbus boost is on
  ...

parents 148a6504 c22fca40

Documentation/ABI/testing/sysfs-class-power

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -380,13 +380,17 @@ Description:
	algorithm to adjust the charge rate dynamically, without		algorithm to adjust the charge rate dynamically, without
	any user configuration required. "Custom" means that the charger		any user configuration required. "Custom" means that the charger
	uses the charge_control_* properties as configuration for some		uses the charge_control_* properties as configuration for some
	different algorithm.		different algorithm. "Long Life" means the charger reduces its
			charging rate in order to prolong the battery health. "Bypass"
			means the charger bypasses the charging path around the
			integrated converter allowing for a "smart" wall adaptor to
			perform the power conversion externally.

	Access: Read, Write		Access: Read, Write

	Valid values:		Valid values:
	"Unknown", "N/A", "Trickle", "Fast", "Standard",		"Unknown", "N/A", "Trickle", "Fast", "Standard",
	"Adaptive", "Custom"		"Adaptive", "Custom", "Long Life", "Bypass"

	What: /sys/class/power_supply/<supply_name>/charge_term_current		What: /sys/class/power_supply/<supply_name>/charge_term_current
	Date: July 2014		Date: July 2014

Documentation/devicetree/bindings/power/supply/stericsson,ab8500-fg.yaml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,11 @@ properties:
	$ref: /schemas/types.yaml#/definitions/phandle		$ref: /schemas/types.yaml#/definitions/phandle
	deprecated: true		deprecated: true

			line-impedance-micro-ohms:
			description: The line impedance between the battery and the
			AB8500 inputs, to compensate for this when determining internal
			resistance.

	interrupts:		interrupts:
	maxItems: 5		maxItems: 5

Documentation/devicetree/bindings/trivial-devices.yaml

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -143,6 +143,14 @@ properties:
	- infineon,xdpe12254		- infineon,xdpe12254
	# Infineon Multi-phase Digital VR Controller xdpe12284		# Infineon Multi-phase Digital VR Controller xdpe12284
	- infineon,xdpe12284		- infineon,xdpe12284
			# Injoinic IP5108 2.0A Power Bank IC with I2C
			- injoinic,ip5108
			# Injoinic IP5109 2.1A Power Bank IC with I2C
			- injoinic,ip5109
			# Injoinic IP5207 1.2A Power Bank IC with I2C
			- injoinic,ip5207
			# Injoinic IP5209 2.4A Power Bank IC with I2C
			- injoinic,ip5209
	# Inspur Power System power supply unit version 1		# Inspur Power System power supply unit version 1
	- inspur,ipsps1		- inspur,ipsps1
	# Intersil ISL29028 Ambient Light and Proximity Sensor		# Intersil ISL29028 Ambient Light and Proximity Sensor

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -571,6 +571,8 @@ patternProperties:
	description: InfoVision Optoelectronics Kunshan Co. Ltd.		description: InfoVision Optoelectronics Kunshan Co. Ltd.
	"^ingenic,.*":		"^ingenic,.*":
	description: Ingenic Semiconductor		description: Ingenic Semiconductor
			"^injoinic,.*":
			description: Injoinic Technology Corp.
	"^innolux,.*":		"^innolux,.*":
	description: Innolux Corporation		description: Innolux Corporation
	"^inside-secure,.*":		"^inside-secure,.*":

MAINTAINERS

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9537,6 +9537,11 @@ F: include/linux/mfd/ingenic-tcu.h
	F: sound/soc/codecs/jz47*		F: sound/soc/codecs/jz47*
	F: sound/soc/jz4740/		F: sound/soc/jz4740/

			INJOINIC IP5xxx POWER BANK IC DRIVER
			M: Samuel Holland <samuel@sholland.org>
			S: Maintained
			F: drivers/power/supply/ip5xxx_power.c

	INOTIFY		INOTIFY
	M: Jan Kara <jack@suse.cz>		M: Jan Kara <jack@suse.cz>
	R: Amir Goldstein <amir73il@gmail.com>		R: Amir Goldstein <amir73il@gmail.com>