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

Commit 4e7b1e9b 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 HW_CURRENT_MAX power_supply property" into msm-4.9

parents 291e6178 104edd8b

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(connector_health),

	POWER_SUPPLY_ATTR(ctm_current_max),

	POWER_SUPPLY_ATTR(hw_current_max),

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

	POWER_SUPPLY_PROP_CONNECTOR_HEALTH,

	POWER_SUPPLY_PROP_CTM_CURRENT_MAX,

	POWER_SUPPLY_PROP_HW_CURRENT_MAX,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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