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

Commit 77079d93 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 POWER_SUPPLY_PROP_FLASH_TRIGGER"

parents 909f1f63 1ca0c01f

drivers/power/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(charge_done),

	POWER_SUPPLY_ATTR(flash_active),

	POWER_SUPPLY_ATTR(flash_trigger),

	POWER_SUPPLY_ATTR(force_tlim),

	POWER_SUPPLY_ATTR(dp_dm),

	POWER_SUPPLY_ATTR(input_current_limited),

include/linux/power_supply.h

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

	POWER_SUPPLY_PROP_CHARGE_DONE,

	POWER_SUPPLY_PROP_FLASH_ACTIVE,

	POWER_SUPPLY_PROP_FLASH_TRIGGER,

	POWER_SUPPLY_PROP_FORCE_TLIM,

	POWER_SUPPLY_PROP_DP_DM,

	POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED,