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

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

Merge "power: supply: Add property to vote for TLIM" into msm-4.8

parents 83456231 4a8b5010

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(set_ship_mode),

	POWER_SUPPLY_ATTR(boost_current),

	POWER_SUPPLY_ATTR(force_tlim),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

	/* Properties of type `const char *' */

include/linux/power_supply.h

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

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	POWER_SUPPLY_PROP_BOOST_CURRENT,

	POWER_SUPPLY_PROP_FORCE_TLIM,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

	/* Properties of type `const char *' */