public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Anton Vorontsov <cbouatmailru@gmail.com>
To: Grazvydas Ignotas <notasas@gmail.com>
Cc: "Rodolfo Giometti" <giometti@linux.it>,
	linux-kernel@vger.kernel.org, "Pali Rohár" <pali.rohar@gmail.com>
Subject: Fwd: [PATCH] bq27x00_battery: Some fixes
Date: Mon, 31 Jan 2011 16:54:17 +0300	[thread overview]
Message-ID: <20110131135417.GC3883@oksana.dev.rtsoft.ru> (raw)

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 -----

             reply	other threads:[~2011-01-31 13:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-31 13:54 Anton Vorontsov [this message]
2011-01-31 15:46 ` Fwd: [PATCH] bq27x00_battery: Some fixes Rodolfo Giometti
2011-01-31 18:00   ` Pali Rohár
2011-01-31 18:15 ` Lars-Peter Clausen
2011-01-31 18:27   ` Anton Vorontsov
2011-01-31 19:16     ` Lars-Peter Clausen
2011-01-31 19:28       ` Pali Rohár

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110131135417.GC3883@oksana.dev.rtsoft.ru \
    --to=cbouatmailru@gmail.com \
    --cc=giometti@linux.it \
    --cc=linux-kernel@vger.kernel.org \
    --cc=notasas@gmail.com \
    --cc=pali.rohar@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox