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

Commit afd42265 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 HVDCP_OPTI_ALLOWED property"

parents 87a85abf 7b850f65

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(toggle_stat),

	POWER_SUPPLY_ATTR(allow_hvdcp3),

	POWER_SUPPLY_ATTR(hvdcp_opti_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
@@ -280,6 +280,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_RECHARGE_SOC,

	POWER_SUPPLY_PROP_TOGGLE_STAT,

	POWER_SUPPLY_PROP_ALLOW_HVDCP3,

	POWER_SUPPLY_PROP_HVDCP_OPTI_ALLOWED,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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