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

Commit a2d12088 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power_supply: Add property for ship mode" into msm-4.8

parents 50aeffbc 53758763

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(usb_otg),

	POWER_SUPPLY_ATTR(charge_enabled),

	POWER_SUPPLY_ATTR(set_ship_mode),

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

	POWER_SUPPLY_PROP_USB_OTG,

	POWER_SUPPLY_PROP_CHARGE_ENABLED,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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