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

Commit d6f2095d 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 REAL_TYPE power_supply_property"

parents 33f9492c afcfc272

drivers/power/power_supply_sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ static ssize_t power_supply_show_property(struct device *dev, 
		return sprintf(buf, "%s\n", technology_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)

		return sprintf(buf, "%s\n", capacity_level_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_TYPE)

	else if (off == POWER_SUPPLY_PROP_TYPE ||

			off == POWER_SUPPLY_PROP_REAL_TYPE)

		return sprintf(buf, "%s\n", type_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_SCOPE)

		return sprintf(buf, "%s\n", scope_text[value.intval]);
@@ -305,6 +306,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(die_health),

	POWER_SUPPLY_ATTR(connector_health),

	POWER_SUPPLY_ATTR(hw_current_max),

	POWER_SUPPLY_ATTR(real_type),

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

	POWER_SUPPLY_PROP_CONNECTOR_HEALTH,

	POWER_SUPPLY_PROP_HW_CURRENT_MAX,

	POWER_SUPPLY_PROP_REAL_TYPE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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