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

Commit 0233a1ff 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 INPUT_SUSPEND power supply property"

parents b5e42722 4fcb9c87

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(battery_charging_enabled),

	POWER_SUPPLY_ATTR(charging_enabled),

	POWER_SUPPLY_ATTR(input_suspend),

	POWER_SUPPLY_ATTR(input_voltage_regulation),

	POWER_SUPPLY_ATTR(input_current_max),

	POWER_SUPPLY_ATTR(input_current_trim),

include/linux/power_supply.h

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

	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_INPUT_SUSPEND,

	POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,

	POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,

	POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM,