Merge "power_supply: Add BOOST_CURRENT property"

This commit is contained in:
Linux Build Service Account 2016-12-09 19:59:28 -08:00 committed by Gerrit - the friendly Code Review server
commit 55f7c3c5f2
2 changed files with 2 additions and 0 deletions

View file

@ -250,6 +250,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(update_now), POWER_SUPPLY_ATTR(update_now),
POWER_SUPPLY_ATTR(esr_count), POWER_SUPPLY_ATTR(esr_count),
POWER_SUPPLY_ATTR(buck_freq), POWER_SUPPLY_ATTR(buck_freq),
POWER_SUPPLY_ATTR(boost_current),
POWER_SUPPLY_ATTR(safety_timer_enabled), POWER_SUPPLY_ATTR(safety_timer_enabled),
POWER_SUPPLY_ATTR(charge_done), POWER_SUPPLY_ATTR(charge_done),
POWER_SUPPLY_ATTR(flash_active), POWER_SUPPLY_ATTR(flash_active),

View file

@ -199,6 +199,7 @@ enum power_supply_property {
POWER_SUPPLY_PROP_UPDATE_NOW, POWER_SUPPLY_PROP_UPDATE_NOW,
POWER_SUPPLY_PROP_ESR_COUNT, POWER_SUPPLY_PROP_ESR_COUNT,
POWER_SUPPLY_PROP_BUCK_FREQ, POWER_SUPPLY_PROP_BUCK_FREQ,
POWER_SUPPLY_PROP_BOOST_CURRENT,
POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE, POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE,
POWER_SUPPLY_PROP_CHARGE_DONE, POWER_SUPPLY_PROP_CHARGE_DONE,
POWER_SUPPLY_PROP_FLASH_ACTIVE, POWER_SUPPLY_PROP_FLASH_ACTIVE,