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

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

Merge "power_supply: Add additional USB PD properties" into msm-4.8

parents bb100310 2f3c825f

drivers/power/supply/power_supply_sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(typec_power_role),

	POWER_SUPPLY_ATTR(pd_allowed),

	POWER_SUPPLY_ATTR(pd_active),

	POWER_SUPPLY_ATTR(pd_in_hard_reset),

	POWER_SUPPLY_ATTR(pd_current_max),

	POWER_SUPPLY_ATTR(pd_usb_suspend_supported),

	POWER_SUPPLY_ATTR(set_ship_mode),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

include/linux/power_supply.h

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,

	POWER_SUPPLY_PROP_PD_ALLOWED,

	POWER_SUPPLY_PROP_PD_ACTIVE,

	POWER_SUPPLY_PROP_PD_IN_HARD_RESET,

	POWER_SUPPLY_PROP_PD_CURRENT_MAX,

	POWER_SUPPLY_PROP_PD_USB_SUSPEND_SUPPORTED,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,