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

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

Merge "power_supply: Add PE_START property" into msm-4.8

parents e869096a 6d3ad968

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(pd_current_max),

	POWER_SUPPLY_ATTR(pd_usb_suspend_supported),

	POWER_SUPPLY_ATTR(pe_start),

	POWER_SUPPLY_ATTR(set_ship_mode),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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_PD_IN_HARD_RESET,

	POWER_SUPPLY_PROP_PD_CURRENT_MAX,

	POWER_SUPPLY_PROP_PD_USB_SUSPEND_SUPPORTED,

	POWER_SUPPLY_PROP_PE_START,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,