diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-09 19:59:28 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-09 19:59:28 -0800 |
| commit | 55f7c3c5f28dd02ee9bfcdf4a537f3069388671d (patch) | |
| tree | 2a216cd44435cd09695e73e4c1d93a114f9d2302 | |
| parent | 9ad5708a9e23ab524078e08f6d05bceaabf43ba1 (diff) | |
| parent | a5dea1fbd6544ca5911671db71fab6916d61878d (diff) | |
Merge "power_supply: Add BOOST_CURRENT property"
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 2718ea93bd45..d83928901a77 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -250,6 +250,7 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(update_now), POWER_SUPPLY_ATTR(esr_count), POWER_SUPPLY_ATTR(buck_freq), + POWER_SUPPLY_ATTR(boost_current), POWER_SUPPLY_ATTR(safety_timer_enabled), POWER_SUPPLY_ATTR(charge_done), POWER_SUPPLY_ATTR(flash_active), diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 18e1a979db76..125568f7862c 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -199,6 +199,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_UPDATE_NOW, POWER_SUPPLY_PROP_ESR_COUNT, POWER_SUPPLY_PROP_BUCK_FREQ, + POWER_SUPPLY_PROP_BOOST_CURRENT, POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE, POWER_SUPPLY_PROP_CHARGE_DONE, POWER_SUPPLY_PROP_FLASH_ACTIVE, |