diff options
| author | MyungJoo Ham <myungjoo.ham@samsung.com> | 2012-03-14 03:00:01 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-03-26 18:41:25 +0200 |
| commit | 6e0e60cd0d688d0d1af85ef2abb8e363595af988 (patch) | |
| tree | 0c18bb3f9bd7a80e0fc532b3d9b3093e0c386297 /drivers/power | |
| parent | max8998_charger: Include linux/module.h just once (diff) | |
| download | linux-6e0e60cd0d688d0d1af85ef2abb8e363595af988.tar.xz linux-6e0e60cd0d688d0d1af85ef2abb8e363595af988.zip | |
max17042_battery: Fix CHARGE_FULL representation.
CHARGE_FULL should represent the full capacity of the battery in uAh.
The 0x10 (FullCAP) register shows the compensated full capacity in
mAh * 2; e.g., reg(0x10) = 0xBB8 means that it is 1500mAh.
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/max17042_battery.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index 5474e76d36fb..d576912b1219 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c @@ -179,14 +179,11 @@ static int max17042_get_property(struct power_supply *psy, val->intval = ret >> 8; break; case POWER_SUPPLY_PROP_CHARGE_FULL: - ret = max17042_read_reg(chip->client, MAX17042_RepSOC); + ret = max17042_read_reg(chip->client, MAX17042_FullCAP); if (ret < 0) return ret; - if ((ret >> 8) >= MAX17042_BATTERY_FULL) - val->intval = 1; - else if (ret >= 0) - val->intval = 0; + val->intval = ret * 1000 / 2; break; case POWER_SUPPLY_PROP_TEMP: ret = max17042_read_reg(chip->client, MAX17042_TEMP); |