Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mirror_ubuntu-bionic-kernel.git] / drivers / power / max17042_battery.c

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 140788b309f84fe26056e77636eff26b954d8cb8..74abc6c755b498bf023fcd540b9232743f1cd744 100644 (file)
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -113,6 +113,7 @@ static enum power_supply_property max17042_battery_props[] = {
        POWER_SUPPLY_PROP_VOLTAGE_OCV,
        POWER_SUPPLY_PROP_CAPACITY,
        POWER_SUPPLY_PROP_CHARGE_FULL,
+       POWER_SUPPLY_PROP_CHARGE_COUNTER,
        POWER_SUPPLY_PROP_TEMP,
        POWER_SUPPLY_PROP_CURRENT_NOW,
        POWER_SUPPLY_PROP_CURRENT_AVG,
@@ -199,6 +200,13 @@ static int max17042_get_property(struct power_supply *psy,
                if (ret < 0)
                        return ret;
 
+               val->intval = ret * 1000 / 2;
+               break;
+       case POWER_SUPPLY_PROP_CHARGE_COUNTER:
+               ret = max17042_read_reg(chip->client, MAX17042_QH);
+               if (ret < 0)
+                       return ret;
+
                val->intval = ret * 1000 / 2;
                break;
        case POWER_SUPPLY_PROP_TEMP: