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

Commit 543fbd20 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 CHARGER_TEMP and CHARGER_TEMP_MAX properties"

parents 61e79960 5bd071c6

drivers/power/power_supply_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(typec_power_role),

	POWER_SUPPLY_ATTR(pd_allowed),

	POWER_SUPPLY_ATTR(pd_active),

	POWER_SUPPLY_ATTR(charger_temp),

	POWER_SUPPLY_ATTR(charger_temp_max),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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

include/linux/power_supply.h

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,

	POWER_SUPPLY_PROP_PD_ALLOWED,

	POWER_SUPPLY_PROP_PD_ACTIVE,

	POWER_SUPPLY_PROP_CHARGER_TEMP,

	POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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