From 03551257204f601ee18593f126d39dfbc03f6808 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pallala Date: Mon, 7 May 2012 10:25:58 +0530 Subject: [PATCH] --- yaml --- r: 320488 b: refs/heads/master c: 5fc55bc8225d5a5c13b978e3e3dbf51e6cd6a333 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/max17042_battery.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0bb794f17ea2..5062bfe6854f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19dd6bcd1136d254c1f12b0f69e827c3e1679b43 +refs/heads/master: 5fc55bc8225d5a5c13b978e3e3dbf51e6cd6a333 diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c index 140788b309f8..74abc6c755b4 100644 --- a/trunk/drivers/power/max17042_battery.c +++ b/trunk/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: