From: Juergen Borleis <jbe@pengutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
kernel@pengutronix.de
Subject: [PATCH 4/7] bq27425: the DesignCapacity register is at a different offset
Date: Tue, 10 Jun 2014 11:44:50 +0200 [thread overview]
Message-ID: <1402393493-3559-5-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1402393493-3559-1-git-send-email-jbe@pengutronix.de>
For the BQ27425-g1 this register does not exists at all.
For the BQ27425-g2a this register is at offset 0x3C.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
drivers/power/bq27x00_battery.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 39b5194..a5a88f1 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -78,6 +78,9 @@
#define BQ27425_REG_OFFSET 0x04
#define BQ27425_REG_SOC 0x20 /* Register address plus offset */
+/* register offsets above 0x20 are DEVICE_TYPE 0x0425 specifc */
+#define BQ27425_REG_DCAP 0x40 /* Design capacity plus offset */
+
#define BQ27000_RS 20 /* Resistor sense */
#define BQ27x00_POWER_CONSTANT (256 * 29200 / 1000)
@@ -265,9 +268,17 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di)
{
int ilmd;
- if (bq27xxx_is_chip_version_higher(di))
- ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);
- else
+ if (bq27xxx_is_chip_version_higher(di)) {
+ if (di->chip == BQ27425) {
+ if (di->chip_type == BQ27425_g2a)
+ ilmd = bq27x00_read(di, BQ27425_REG_DCAP,
+ false);
+ else
+ ilmd = -ENODATA;
+ } else {
+ ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);
+ }
+ } else
ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);
if (ilmd < 0) {
--
2.0.0.rc2
next prev parent reply other threads:[~2014-06-10 9:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 9:44 Power/battery/BQ27xxx: some fixes and hot-plug support Juergen Borleis
2014-06-10 9:44 ` [PATCH 1/7] bq27425: fix register offset for SOC on bq27425 Juergen Borleis
2014-06-10 9:44 ` [PATCH 2/7] bq27425: add support to read the control registers Juergen Borleis
2014-06-10 9:44 ` [PATCH 3/7] bq27425: add support for different firmware chip types Juergen Borleis
2014-06-10 9:44 ` Juergen Borleis [this message]
2014-06-10 9:44 ` [PATCH 5/7] bq27xxx: suppress error messages Juergen Borleis
2014-06-10 9:44 ` [PATCH 6/7] bq27xxx: init the cache first Juergen Borleis
2014-06-10 9:44 ` [PATCH 7/7] bq27xxx: enable hot-plug support Juergen Borleis
2014-07-08 8:28 ` Power/battery/BQ27xxx: some fixes and " Steffen Trumtrar
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=1402393493-3559-5-git-send-email-jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®