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

Commit 0d4f5917 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power_supply: Add RESISTANCE_CAPACITIVE property"

parents e7200875 ca12a29c

Documentation/power/power_supply_class.txt

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ CAPACITY_ALERT_MAX - maximum capacity alert value in percents. 
CAPACITY_LEVEL - capacity level. This corresponds to

POWER_SUPPLY_CAPACITY_LEVEL_*.



RESISTANCE - battery resistance in milli ohms

RESISTANCE_CAPACITIVE - battery capacitive resistance in milli ohms



TEMP - temperature of the power supply.

TEMP_ALERT_MIN - minimum battery temperature alert value in milli centigrade.

TEMP_ALERT_MAX - maximum battery temperature alert value in milli centigrade.

drivers/power/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(scope),

	POWER_SUPPLY_ATTR(system_temp_level),

	POWER_SUPPLY_ATTR(resistance),

	POWER_SUPPLY_ATTR(resistance_capacitive),

	/* Local extensions */

	POWER_SUPPLY_ATTR(usb_hc),

	POWER_SUPPLY_ATTR(usb_otg),

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_SCOPE,

	POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,

	POWER_SUPPLY_PROP_RESISTANCE,

	POWER_SUPPLY_PROP_RESISTANCE_CAPACITIVE,

	/* Local extensions */

	POWER_SUPPLY_PROP_USB_HC,

	POWER_SUPPLY_PROP_USB_OTG,