Merge "power: power_supply: add property for sw based JEITA"

This commit is contained in:
Linux Build Service Account 2017-08-09 03:18:21 -07:00 committed by Gerrit - the friendly Code Review server
commit 772f98746e
2 changed files with 2 additions and 0 deletions

View file

@ -299,6 +299,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(pr_swap),
POWER_SUPPLY_ATTR(cc_step),
POWER_SUPPLY_ATTR(cc_step_sel),
POWER_SUPPLY_ATTR(sw_jeita_enabled),
/* Local extensions of type int64_t */
POWER_SUPPLY_ATTR(charge_counter_ext),
/* Properties of type `const char *' */

View file

@ -251,6 +251,7 @@ enum power_supply_property {
POWER_SUPPLY_PROP_PR_SWAP,
POWER_SUPPLY_PROP_CC_STEP,
POWER_SUPPLY_PROP_CC_STEP_SEL,
POWER_SUPPLY_PROP_SW_JEITA_ENABLED,
/* Local extensions of type int64_t */
POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
/* Properties of type `const char *' */