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

Commit a0232c0c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power_supply: add property POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE"

parents aa205859 1b801a47

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(update_now),

	POWER_SUPPLY_ATTR(esr_count),

	POWER_SUPPLY_ATTR(safety_timer_enabled),

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

	POWER_SUPPLY_PROP_UPDATE_NOW,

	POWER_SUPPLY_PROP_ESR_COUNT,

	POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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