leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bq27x00_battery: Do not cache current_now value for bq27000 batery

Browse Source 
* This prevent reporting old current_now value for bq27000
* Also ask for current flags, to make sure that current_now
  will be reported with correct signature

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
This commit is contained in:
Pali Rohár 2011-11-01 01:43:03 +01:00 committed by Anton Vorontsov
parent e7a5f6d559
commit b68f6216c5
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/power/bq27x00_battery.c
View File

@ -80,8 +80,6 @@ struct bq27x00_reg_cache {
int cycle_count; int cycle_count;
int capacity; int capacity;
int flags; int flags;
int current_now;
}; };
struct bq27x00_device_info { struct bq27x00_device_info {
@ -270,17 +268,12 @@ static void bq27x00_update(struct bq27x00_device_info *di)
cache.charge_full = bq27x00_battery_read_lmd(di); cache.charge_full = bq27x00_battery_read_lmd(di);
cache.cycle_count = bq27x00_battery_read_cyct(di); cache.cycle_count = bq27x00_battery_read_cyct(di);
if (!is_bq27500)
cache.current_now = bq27x00_read(di, BQ27x00_REG_AI, false);
/* We only have to read charge design full once */ /* We only have to read charge design full once */
if (di->charge_design_full <= 0) if (di->charge_design_full <= 0)
di->charge_design_full = bq27x00_battery_read_ilmd(di); di->charge_design_full = bq27x00_battery_read_ilmd(di);
} }
/* Ignore current_now which is a snapshot of the current battery state if (memcmp(&di->cache, &cache, sizeof(cache)) != 0) {
* and is likely to be different even between two consecutive reads */
if (memcmp(&di->cache, &cache, sizeof(cache) - sizeof(int)) != 0) {
di->cache = cache; di->cache = cache;
power_supply_changed(&di->bat); power_supply_changed(&di->bat);
} }
@ -330,12 +323,9 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di,
union power_supply_propval *val) union power_supply_propval *val)
{ {
int curr; int curr;
int flags;
if (di->chip == BQ27500)
curr = bq27x00_read(di, BQ27x00_REG_AI, false); curr = bq27x00_read(di, BQ27x00_REG_AI, false);
else
curr = di->cache.current_now;
if (curr < 0) if (curr < 0)
return curr; return curr;
@ -343,7 +333,8 @@ static int bq27x00_battery_current(struct bq27x00_device_info *di,
/* bq27500 returns signed value */ /* bq27500 returns signed value */
val->intval = (int)((s16)curr) * 1000; val->intval = (int)((s16)curr) * 1000;
} else { } else {
if (di->cache.flags & BQ27000_FLAG_CHGS) { flags = bq27x00_read(di, BQ27x00_REG_FLAGS, false);
if (flags & BQ27000_FLAG_CHGS) {
dev_dbg(di->dev, "negative current!\n"); dev_dbg(di->dev, "negative current!\n");
curr = -curr; curr = -curr;
} }