diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-09-18 17:31:16 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2011-02-22 11:02:46 +0100 |
| commit | c1b9ab67e7c7021be9d0db6345d6ccc5d70248f1 (patch) | |
| tree | 74c100e21f9f35c848c892b37606b202fd6180cc /drivers/power | |
| parent | fd9b958c5525024204e7e2c48fe5eae560d171bd (diff) | |
| download | kernel_samsung_smdk4412-c1b9ab67e7c7021be9d0db6345d6ccc5d70248f1.tar.gz kernel_samsung_smdk4412-c1b9ab67e7c7021be9d0db6345d6ccc5d70248f1.tar.bz2 kernel_samsung_smdk4412-c1b9ab67e7c7021be9d0db6345d6ccc5d70248f1.zip | |
bq27x00: Give more specific reports on battery status
The current code only reports whether the battery is charging or
discharging. But the battery also reports whether it is fully charged,
furthermore by look at if the battery is supplied we can tell whether it
is discharging or not charging.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 0e99d02dea3..003be5f1c78 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -54,6 +54,7 @@ #define BQ27000_REG_RSOC 0x0B /* Relative State-of-Charge */ #define BQ27000_REG_ILMD 0x76 /* Initial last measured discharge */ #define BQ27000_FLAG_CHGS BIT(7) +#define BQ27000_FLAG_FC BIT(5) #define BQ27500_REG_SOC 0x2c #define BQ27500_REG_DCAP 0x3C /* Design capacity */ @@ -365,8 +366,12 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di, else status = POWER_SUPPLY_STATUS_CHARGING; } else { - if (di->cache.flags & BQ27000_FLAG_CHGS) + if (di->cache.flags & BQ27000_FLAG_FC) + status = POWER_SUPPLY_STATUS_FULL; + else if (di->cache.flags & BQ27000_FLAG_CHGS) status = POWER_SUPPLY_STATUS_CHARGING; + else if (power_supply_am_i_supplied(&di->bat)) + status = POWER_SUPPLY_STATUS_NOT_CHARGING; else status = POWER_SUPPLY_STATUS_DISCHARGING; } |