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

Commit 65d82554 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 POWER_SUPPLY_PROP_{COLD,HOT}_TEMP properties"

parents 2aa071c3 1c793bc2

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(temp_cool),

	POWER_SUPPLY_ATTR(temp_warm),

	POWER_SUPPLY_ATTR(temp_cold),

	POWER_SUPPLY_ATTR(temp_hot),

	POWER_SUPPLY_ATTR(system_temp_level),

	POWER_SUPPLY_ATTR(resistance),

	POWER_SUPPLY_ATTR(resistance_capacitive),

include/linux/power_supply.h

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

	POWER_SUPPLY_PROP_COOL_TEMP,

	POWER_SUPPLY_PROP_WARM_TEMP,

	POWER_SUPPLY_PROP_COLD_TEMP,

	POWER_SUPPLY_PROP_HOT_TEMP,

	POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,

	POWER_SUPPLY_PROP_RESISTANCE,

	POWER_SUPPLY_PROP_RESISTANCE_CAPACITIVE,