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

Commit 14e5892a 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 for ship mode"

parents 27e62318 2a167923

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(parallel_percent),

	POWER_SUPPLY_ATTR(pe_start),

	POWER_SUPPLY_ATTR(set_ship_mode),

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

	POWER_SUPPLY_PROP_PARALLEL_PERCENT,

	POWER_SUPPLY_PROP_PE_START,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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