Merge "power_supply: Add PE_START property"

This commit is contained in:
Linux Build Service Account 2016-10-19 19:11:52 -07:00 committed by Gerrit - the friendly Code Review server
commit 297ba5f877
2 changed files with 2 additions and 0 deletions
drivers/power
include/linux

View file

@ -275,6 +275,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(charger_temp_max),
POWER_SUPPLY_ATTR(parallel_disable),
POWER_SUPPLY_ATTR(parallel_percent),
POWER_SUPPLY_ATTR(pe_start),
/* Local extensions of type int64_t */
POWER_SUPPLY_ATTR(charge_counter_ext),
/* Properties of type `const char *' */

View file

@ -224,6 +224,7 @@ enum power_supply_property {
POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,
POWER_SUPPLY_PROP_PARALLEL_DISABLE,
POWER_SUPPLY_PROP_PARALLEL_PERCENT,
POWER_SUPPLY_PROP_PE_START,
/* Local extensions of type int64_t */
POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
/* Properties of type `const char *' */