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

Commit 642da012 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power_supply: Add RESISTANCE property to power supply" into msm-4.9

parents c52e36bb 540f4ebc

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(charge_term_current),

	POWER_SUPPLY_ATTR(calibrate),

	POWER_SUPPLY_ATTR(resistance),

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

	POWER_SUPPLY_PROP_CHARGE_TERM_CURRENT,

	POWER_SUPPLY_PROP_CALIBRATE,

	POWER_SUPPLY_PROP_RESISTANCE,

	/* Local extensions */

	POWER_SUPPLY_PROP_USB_HC,

	POWER_SUPPLY_PROP_USB_OTG,