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

Commit 44f1094a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power_supply: Add DC_RESET power-supply property"

parents 54dbb272 64b1aa1b

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(chip_version),

	POWER_SUPPLY_ATTR(therm_icl_limit),

	POWER_SUPPLY_ATTR(dc_reset),

	/* Charge pump properties */

	POWER_SUPPLY_ATTR(cp_status1),

	POWER_SUPPLY_ATTR(cp_status2),

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_VOLTAGE_VPH,

	POWER_SUPPLY_PROP_CHIP_VERSION,

	POWER_SUPPLY_PROP_THERM_ICL_LIMIT,

	POWER_SUPPLY_PROP_DC_RESET,

	/* Charge pump properties */

	POWER_SUPPLY_PROP_CP_STATUS1,

	POWER_SUPPLY_PROP_CP_STATUS2,