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

Commit da5578f0 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: Introduce property for restricted charging"

parents d30b57b2 ab30a62b

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(cycle_count_id),

	POWER_SUPPLY_ATTR(safety_timer_expired),

	POWER_SUPPLY_ATTR(restricted_charging),

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

	POWER_SUPPLY_PROP_CYCLE_COUNT_ID,

	POWER_SUPPLY_PROP_SAFETY_TIMER_EXPIRED,

	POWER_SUPPLY_PROP_RESTRICTED_CHARGING,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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