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

Commit 78b79199 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 two properties for step charging"

parents 7d231bbe 192d5101

drivers/power/power_supply_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(usb_otg),

	POWER_SUPPLY_ATTR(battery_charging_enabled),

	POWER_SUPPLY_ATTR(charging_enabled),

	POWER_SUPPLY_ATTR(step_charging_enabled),

	POWER_SUPPLY_ATTR(step_charging_step),

	POWER_SUPPLY_ATTR(pin_enabled),

	POWER_SUPPLY_ATTR(input_suspend),

	POWER_SUPPLY_ATTR(input_voltage_regulation),

include/linux/power_supply.h

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_USB_OTG,

	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_STEP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_STEP_CHARGING_STEP,

	POWER_SUPPLY_PROP_PIN_ENABLED,

	POWER_SUPPLY_PROP_INPUT_SUSPEND,

	POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,