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

Commit 1335b29f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power_supply: Add property to limit pulses for HVDCP"

parents 52facc5d d5fc4602

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(allow_hvdcp3),

	POWER_SUPPLY_ATTR(hvdcp_opti_allowed),

	POWER_SUPPLY_ATTR(max_pulse_allowed),

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

	POWER_SUPPLY_PROP_ALLOW_HVDCP3,

	POWER_SUPPLY_PROP_HVDCP_OPTI_ALLOWED,

	POWER_SUPPLY_PROP_MAX_PULSE_ALLOWED,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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