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

Commit 7b6bf56e 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 battery info, jeita detection support"

parents ebc2508e 775f6389

drivers/power/supply/power_supply_sysfs.c

+4 −0
Original line number Diff line number Diff line
@@ -331,6 +331,10 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(allow_hvdcp3),

	POWER_SUPPLY_ATTR(hvdcp_opti_allowed),

	POWER_SUPPLY_ATTR(max_pulse_allowed),

	POWER_SUPPLY_ATTR(ignore_false_negative_isense),

	POWER_SUPPLY_ATTR(battery_info),

	POWER_SUPPLY_ATTR(battery_info_id),

	POWER_SUPPLY_ATTR(enable_jeita_detection),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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

include/linux/power_supply.h

+4 −0
Original line number Diff line number Diff line
@@ -282,6 +282,10 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_ALLOW_HVDCP3,

	POWER_SUPPLY_PROP_HVDCP_OPTI_ALLOWED,

	POWER_SUPPLY_PROP_MAX_PULSE_ALLOWED,

	POWER_SUPPLY_PROP_IGNORE_FALSE_NEGATIVE_ISENSE,

	POWER_SUPPLY_PROP_BATTERY_INFO,

	POWER_SUPPLY_PROP_BATTERY_INFO_ID,

	POWER_SUPPLY_PROP_ENABLE_JEITA_DETECTION,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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