Messages in this thread Patch in this message | | | Date | Mon, 31 Jan 2011 16:54:17 +0300 | From | Anton Vorontsov <> | Subject | Fwd: [PATCH] bq27x00_battery: Some fixes |
| |
The same is for this patch.
Comments, Reviewed-by or Acked-by?
p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time() fix to a separate patch.
----- Forwarded message from Pali Rohár <pali.rohar@gmail.com> -----
Date: Wed, 26 Jan 2011 21:42:39 +0100 From: Pali Rohár <pali.rohar@gmail.com> To: Anton Vorontsov <cbouatmailru@gmail.com> Cc: David Woodhouse <dwmw2@infradead.org> Subject: Re: [PATCH] bq27x00_battery
This patch fix reporting correct (devided by resistor sense) values on bq27000/bq27200 batteries.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Tested-by: Pali Rohár <pali.rohar@gmail.com>
--- a/drivers/power/bq27x00_battery.c 2011-01-26 21:30:40.000000000 +0100 +++ b/drivers/power/bq27x00_battery.c 2011-01-26 21:32:34.000000000 +0100 @@ -37,10 +37,11 @@ #define BQ27x00_REG_TTF 0x18 #define BQ27x00_REG_TTECP 0x26
+#define BQ27000_RS 20 /* Resistor sense */ #define BQ27000_REG_RSOC 0x0B /* Relative State-of-Charge */ #define BQ27000_FLAG_CHGS BIT(7)
-#define BQ27500_REG_SOC 0x2c +#define BQ27500_REG_SOC 0x2C #define BQ27500_FLAG_DSC BIT(0) #define BQ27500_FLAG_FC BIT(9)
@@ -112,7 +113,7 @@ static int bq27x00_battery_temperature(s }
/* - * Return the battery Voltage in milivolts + * Return the battery Voltage in µV * Or < 0 if something fails. */ static int bq27x00_battery_voltage(struct bq27x00_device_info *di) @@ -130,7 +131,7 @@ static int bq27x00_battery_voltage(struc }
/* - * Return the battery average current + * Return the battery average current in µA * Note that current can be negative signed as well * Or 0 if something fails. */ @@ -149,6 +150,7 @@ static int bq27x00_battery_current(struc if (di->chip == BQ27500) { /* bq27500 returns signed value */ curr = (int)(s16)curr; + curr *= 1000; } else { ret = bq27x00_read(BQ27x00_REG_FLAGS, &flags, 0, di); if (ret < 0) { @@ -159,9 +161,10 @@ static int bq27x00_battery_current(struc dev_dbg(di->dev, "negative current!\n"); curr = -curr; } + curr = curr * 3570 / BQ27000_RS; }
- return curr * 1000; + return curr; }
/* @@ -233,7 +236,7 @@ static int bq27x00_battery_time(struct b }
if (tval == 65535) - return -ENODATA; + tval = 0;
val->intval = tval * 60; return 0; ----- End forwarded message ----- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |