Merge tag 'for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply (b0206c4e) · Commits · git / linux-net

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

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		What: /sys/class/power_supply/rt9756-*/watchdog_timer
		Date: Dec 2025
		KernelVersion: 6.19
		Contact: ChiYuan Huang <cy_huang@richtek.com>
		Description:
		This entry shows and sets the watchdog timer when rt9756 charger
		operates in charging mode. When the timer expires, the device
		will disable the charging. To prevent the timer expires, any
		host communication can make the timer restarted.

		Access: Read, Write

		Valid values:
		- 500, 1000, 5000, 30000, 40000, 80000, 128000 or 255000 (milliseconds),
		- 0: disabled

		What: /sys/class/power_supply/rt9756-*/operation_mode
		Date: Dec 2025
		KernelVersion: 6.19
		Contact: ChiYuan Huang <cy_huang@richtek.com>
		Description:
		This entry shows and set the operation mode when rt9756 charger
		operates in charging phase. If 'bypass' mode is used, internal
		path will connect vbus directly to vbat. Else, default 'div2'
		mode for the switch-cap charging.

		Access: Read, Write

		Valid values:
		- 'bypass' or 'div2'

Documentation/devicetree/bindings/power/supply/richtek,rt9756.yaml

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/power/supply/richtek,rt9756.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Richtek RT9756 Smart Cap Divider Charger

		maintainers:
		- ChiYuan Huang <cy_huang@richtek.com>

		description: \|
		The RT9756/RT9757 is a high efficiency and high charge current charger.

		The efficiency is up to 98.2% when VBAT = 4V, IBAT = 2A in DIV2 mode and 99.1%
		when VBAT=4V, IBAT=1A in bypass mode. The maximum charger current is up to 8A
		in DIV2 mode and 5A in bypass mode. The device integrates smart cap divider
		topology, direct charging mode, external over-voltage protection control, an
		input reverse blocking NFET and 2-way regulation, a dual phase charge pump
		core, 8-Channel high speed ADCs and USB BC 1.2 detection.

		RT9770 is almost the same with RT9756/57, only BC 1.2 detection function is
		removed to shrink the die size.

		allOf:
		- $ref: power-supply.yaml#

		properties:
		compatible:
		oneOf:
		- enum:
		- richtek,rt9756
		- richtek,rt9770
		- items:
		- enum:
		- richtek,rt9757
		- const: richtek,rt9756

		reg:
		maxItems: 1

		wakeup-source: true

		interrupts:
		maxItems: 1

		shunt-resistor-micro-ohms:
		description: Battery current sense resistor mounted.
		default: 2000

		required:
		- compatible
		- reg
		- interrupts

		unevaluatedProperties: false

		examples:
		- \|
		#include <dt-bindings/interrupt-controller/irq.h>
		i2c {
		#address-cells = <1>;
		#size-cells = <0>;

		charger@6f {
		compatible = "richtek,rt9756";
		reg = <0x6f>;
		wakeup-source;
		interrupts-extended = <&gpio_intc 32 IRQ_TYPE_EDGE_FALLING>;
		shunt-resistor-micro-ohms = <5000>;
		};
		};

Documentation/power/power_supply_class.rst

+42 −42

Original line number	Diff line number	Diff line
		@@ -7,35 +7,35 @@ Synopsis
		Power supply class used to represent battery, UPS, AC or DC power supply
		properties to user-space.

		It defines core set of attributes, which should be applicable to (almost)
		It defines a core set of attributes which should be applicable to (almost)
		every power supply out there. Attributes are available via sysfs and uevent
		interfaces.

		Each attribute has well defined meaning, up to unit of measure used. While
		Each attribute has a well-defined meaning, up to the unit of measure used. While
		the attributes provided are believed to be universally applicable to any
		power supply, specific monitoring hardware may not be able to provide them
		all, so any of them may be skipped.

		Power supply class is extensible, and allows to define drivers own attributes.
		The core attribute set is subject to the standard Linux evolution (i.e.
		if it will be found that some attribute is applicable to many power supply
		types or their drivers, it can be added to the core set).
		The power supply class is extensible and allows drivers to define their own
		attributes. The core attribute set is subject to the standard Linux evolution
		(i.e., if some attribute is found to be applicable to many power
		supply types or their drivers, it can be added to the core set).

		It also integrates with LED framework, for the purpose of providing
		It also integrates with the LED framework, for the purpose of providing
		typically expected feedback of battery charging/fully charged status and
		AC/USB power supply online status. (Note that specific details of the
		indication (including whether to use it at all) are fully controllable by
		user and/or specific machine defaults, per design principles of LED
		framework).
		user and/or specific machine defaults, per design principles of the LED
		framework.)


		Attributes/properties
		~~~~~~~~~~~~~~~~~~~~~
		Power supply class has predefined set of attributes, this eliminates code
		duplication across drivers. Power supply class insist on reusing its
		The power supply class has a predefined set of attributes. This eliminates code
		duplication across drivers. The power supply class insists on reusing its
		predefined attributes and their units.

		So, userspace gets predictable set of attributes and their units for any
		So, userspace gets a predictable set of attributes and their units for any
		kind of power supply, and can process/present them to a user in consistent
		manner. Results for different power supplies and machines are also directly
		comparable.
		@@ -61,7 +61,7 @@ Attributes/properties detailed
		\| Charge/Energy/Capacity - how to not confuse \|
		+--------------------------------------------------------------------------+
		\| **Because both "charge" (µAh) and "energy" (µWh) represents "capacity" \|
		\| of battery, this class distinguish these terms. Don't mix them!** \|
		\| of battery, this class distinguishes these terms. Don't mix them!** \|
		\| \|
		\| - `CHARGE_*` \|
		\| attributes represents capacity in µAh only. \|
		@@ -81,7 +81,7 @@ _NOW

		STATUS
		this attribute represents operating status (charging, full,
		discharging (i.e. powering a load), etc.). This corresponds to
		discharging (i.e., powering a load), etc.). This corresponds to
		`BATTERY_STATUS_*` values, as defined in battery.h.

		CHARGE_TYPE
		@@ -92,10 +92,10 @@ CHARGE_TYPE

		AUTHENTIC
		indicates the power supply (battery or charger) connected
		to the platform is authentic(1) or non authentic(0).
		to the platform is authentic(1) or non-authentic(0).

		HEALTH
		represents health of the battery, values corresponds to
		represents health of the battery. Values corresponds to
		POWER_SUPPLY_HEALTH_*, defined in battery.h.

		VOLTAGE_OCV
		@@ -103,11 +103,11 @@ VOLTAGE_OCV

		VOLTAGE_MAX_DESIGN, VOLTAGE_MIN_DESIGN
		design values for maximal and minimal power supply voltages.
		Maximal/minimal means values of voltages when battery considered
		Maximal/minimal means values of voltages when battery is considered
		"full"/"empty" at normal conditions. Yes, there is no direct relation
		between voltage and battery capacity, but some dumb
		batteries use voltage for very approximated calculation of capacity.
		Battery driver also can use this attribute just to inform userspace
		A battery driver also can use this attribute just to inform userspace
		about maximal and minimal voltage thresholds of a given battery.

		VOLTAGE_MAX, VOLTAGE_MIN
		@@ -122,16 +122,16 @@ CURRENT_BOOT
		Reports the current measured during boot

		CHARGE_FULL_DESIGN, CHARGE_EMPTY_DESIGN
		design charge values, when battery considered full/empty.
		design charge values, when battery is considered full/empty.

		ENERGY_FULL_DESIGN, ENERGY_EMPTY_DESIGN
		same as above but for energy.

		CHARGE_FULL, CHARGE_EMPTY
		These attributes means "last remembered value of charge when battery
		became full/empty". It also could mean "value of charge when battery
		These attributes mean "last remembered value of charge when battery
		became full/empty". They also could mean "value of charge when battery is
		considered full/empty at given conditions (temperature, age)".
		I.e. these attributes represents real thresholds, not design values.
		I.e., these attributes represents real thresholds, not design values.

		ENERGY_FULL, ENERGY_EMPTY
		same as above but for energy.
		@@ -153,12 +153,12 @@ CHARGE_TERM_CURRENT
		CONSTANT_CHARGE_CURRENT
		constant charge current programmed by charger.


		CONSTANT_CHARGE_CURRENT_MAX
		maximum charge current supported by the power supply object.

		CONSTANT_CHARGE_VOLTAGE
		constant charge voltage programmed by charger.

		CONSTANT_CHARGE_VOLTAGE_MAX
		maximum charge voltage supported by the power supply object.

		@@ -208,10 +208,10 @@ TEMP_MAX

		TIME_TO_EMPTY
		seconds left for battery to be considered empty
		(i.e. while battery powers a load)
		(i.e., while battery powers a load)
		TIME_TO_FULL
		seconds left for battery to be considered full
		(i.e. while battery is charging)
		(i.e., while battery is charging)


		Battery <-> external power supply interaction
		@@ -220,13 +220,13 @@ Often power supplies are acting as supplies and supplicants at the same
		time. Batteries are good example. So, batteries usually care if they're
		externally powered or not.

		For that case, power supply class implements notification mechanism for
		For that case, the power supply class implements a notification mechanism for
		batteries.

		External power supply (AC) lists supplicants (batteries) names in
		An external power supply (AC) lists supplicants (batteries) names in
		"supplied_to" struct member, and each power_supply_changed() call
		issued by external power supply will notify supplicants via
		external_power_changed callback.
		issued by an external power supply will notify supplicants via
		the external_power_changed callback.


		Devicetree battery characteristics
		@@ -241,14 +241,14 @@ battery node have names corresponding to elements in enum power_supply_property,
		for naming consistency between sysfs attributes and battery node properties.


		QA
		~~
		Q&A
		~~~

		Q:
		Where is POWER_SUPPLY_PROP_XYZ attribute?
		A:
		If you cannot find attribute suitable for your driver needs, feel free
		to add it and send patch along with your driver.
		If you cannot find an attribute suitable for your driver needs, feel free
		to add it and send a patch along with your driver.

		The attributes available currently are the ones currently provided by the
		drivers written.
		@@ -258,18 +258,18 @@ A:


		Q:
		I have some very specific attribute (e.g. battery color), should I add
		I have some very specific attribute (e.g., battery color). Should I add
		this attribute to standard ones?
		A:
		Most likely, no. Such attribute can be placed in the driver itself, if
		it is useful. Of course, if the attribute in question applicable to
		large set of batteries, provided by many drivers, and/or comes from
		it is useful. Of course, if the attribute in question is applicable to
		a large set of batteries, provided by many drivers, and/or comes from
		some general battery specification/standard, it may be a candidate to
		be added to the core attribute set.


		Q:
		Suppose, my battery monitoring chip/firmware does not provides capacity
		Suppose my battery monitoring chip/firmware does not provide capacity
		in percents, but provides charge_{now,full,empty}. Should I calculate
		percentage capacity manually, inside the driver, and register CAPACITY
		attribute? The same question about time_to_empty/time_to_full.
		@@ -278,11 +278,11 @@ A:
		directly measurable by the specific hardware available.

		Inferring not available properties using some heuristics or mathematical
		model is not subject of work for a battery driver. Such functionality
		model is not a subject of work for a battery driver. Such functionality
		should be factored out, and in fact, apm_power, the driver to serve
		legacy APM API on top of power supply class, uses a simple heuristic of
		legacy APM API on top of the power supply class, uses a simple heuristic of
		approximating remaining battery capacity based on its charge, current,
		voltage and so on. But full-fledged battery model is likely not subject
		for kernel at all, as it would require floating point calculation to deal
		with things like differential equations and Kalman filters. This is
		voltage and so on. But a full-fledged battery model is likely not a subject
		for the kernel at all, as it would require floating point calculations to
		deal with things like differential equations and Kalman filters. This is
		better be handled by batteryd/libbattery, yet to be written.

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -22479,6 +22479,12 @@ L: linux-serial@vger.kernel.org
		S: Odd Fixes
		F: drivers/tty/serial/rp2.*

		ROHM BD71828 CHARGER
		M: Andreas Kemnade <andreas@kemnade.info>
		M: Matti Vaittinen <mazziesaccount@gmail.com>
		S: Maintained
		F: drivers/power/supply/bd71828-charger.c

		ROHM BD79703 DAC
		M: Matti Vaittinen <mazziesaccount@gmail.com>
		S: Supported

drivers/power/reset/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -283,6 +283,15 @@ config POWER_RESET_KEYSTONE
		help
		Reboot support for the KEYSTONE SoCs.

		config POWER_RESET_SPACEMIT_P1
		tristate "SpacemiT P1 poweroff and reset driver"
		depends on ARCH_SPACEMIT \|\| COMPILE_TEST
		depends on MFD_SPACEMIT_P1
		default MFD_SPACEMIT_P1
		help
		This driver supports power-off and reset operations for the SpacemiT
		P1 PMIC.

		config POWER_RESET_SYSCON
		bool "Generic SYSCON regmap reset driver"
		depends on OF