diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-08 10:11:38 +0100 |
| commit | d2800e9cfd6bb876f597adbb806de21774067413 (patch) | |
| tree | 5236f073d5af51d5060a46d09884a55b36ea3440 /drivers/battery/battery-factory.c | |
| parent | 3fe26611bb4999c3717d3aface0bac722b9d2653 (diff) | |
| parent | afabf37012e839802f9f3819f621e16aa4acefd2 (diff) | |
| download | kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.zip kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.gz kernel_samsung_smdk4412-d2800e9cfd6bb876f597adbb806de21774067413.tar.bz2 | |
Merge commit 'afabf37012e839802f9f3819f621e16aa4acefd2' into upstreaming
update from cm-13.0
Conflicts:
Makefile
crypto/algapi.c
drivers/char/diag/diagchar.h
drivers/char/diag/diagchar_core.c
drivers/misc/Makefile
kernel/timeconst.pl
Diffstat (limited to 'drivers/battery/battery-factory.c')
| -rw-r--r-- | drivers/battery/battery-factory.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/battery/battery-factory.c b/drivers/battery/battery-factory.c index 0f20fed..8df99ed 100644 --- a/drivers/battery/battery-factory.c +++ b/drivers/battery/battery-factory.c @@ -54,6 +54,7 @@ static struct device_attribute factory_attrs[] = { FACTORY_ATTR(batt_vfocv), FACTORY_ATTR(batt_lp_charging), FACTORY_ATTR(batt_charging_source), + FACTORY_ATTR(charging_enabled), FACTORY_ATTR(test_mode), FACTORY_ATTR(batt_error_test), FACTORY_ATTR(siop_activated), @@ -90,6 +91,7 @@ enum { BATT_VFOCV, BATT_LP_CHARGING, BATT_CHARGING_SOURCE, + CHARGING_ENABLED, TEST_MODE, BATT_ERROR_TEST, SIOP_ACTIVATED, @@ -218,6 +220,13 @@ static ssize_t factory_show_property(struct device *dev, battery_get_info(info, POWER_SUPPLY_PROP_ONLINE); i += scnprintf(buf + i, PAGE_SIZE - i, "%d\n", val); break; + case CHARGING_ENABLED: + if (info->charge_real_state == POWER_SUPPLY_STATUS_CHARGING) + val = ENABLE; + else + val = DISABLE; + i += scnprintf(buf + i, PAGE_SIZE - i, "%d\n", val); + break; case TEST_MODE: val = info->battery_test_mode; i += scnprintf(buf + i, PAGE_SIZE - i, "%d\n", val); |