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

Commit 4d9df463 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power-supply: Add POWER_SUPPLY_PROP_CHARGER_STATUS property"

parents 8a797533 c2427520

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(parallel_output_mode),

	POWER_SUPPLY_ATTR(fg_type),

	POWER_SUPPLY_ATTR(charger_status),

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

	POWER_SUPPLY_PROP_PARALLEL_OUTPUT_MODE,

	POWER_SUPPLY_PROP_FG_TYPE,

	POWER_SUPPLY_PROP_CHARGER_STATUS,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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