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

Commit 140b4565 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 property POWER_SUPPLY_PROP_RESISTANCE_NOW"

parents 248dd47d 4f6abbb0

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(resistance_capacitive),

	POWER_SUPPLY_ATTR(resistance_id),

	POWER_SUPPLY_ATTR(resistance_now),

	/* 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
@@ -161,6 +161,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_RESISTANCE_CAPACITIVE,

	/* unit is in ohms due to ID being typically in kohm range */

	POWER_SUPPLY_PROP_RESISTANCE_ID,

	POWER_SUPPLY_PROP_RESISTANCE_NOW,

	/* Local extensions */

	POWER_SUPPLY_PROP_USB_HC,

	POWER_SUPPLY_PROP_USB_OTG,