From: Liam Breck <liam@networkimprov.net>
To: "Andrew F. Davis" <afd@ti.com>, linux-pm@vger.kernel.org
Cc: Liam Breck <kernel@networkimprov.net>
Subject: [PATCH v9.3 6/8] power: bq27xxx_battery: Keep track of specific chip id
Date: Thu, 9 Mar 2017 16:27:25 -0800 [thread overview]
Message-ID: <20170310002726.30949-1-liam@networkimprov.net> (raw)
From: Liam Breck <kernel@networkimprov.net>
Pass actual chip ID into _setup(), which translates it to a group ID,
to allow support for all chips by the power_supply_battery_info code.
There are no functional changes to the driver.
Signed-off-by: Liam Breck <kernel@networkimprov.net>
---
drivers/power/supply/bq27xxx_battery.c | 12 ++++++++++++
drivers/power/supply/bq27xxx_battery_i2c.c | 16 ++++++++--------
include/linux/power/bq27xxx_battery.h | 24 +++++++++++++++++-------
3 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index 7272d1e..8ce2940 100644
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -1020,6 +1020,18 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
struct power_supply_desc *psy_desc;
struct power_supply_config psy_cfg = { .drv_data = di, };
+ switch(di->chip) {
+ case BQ27520: di->chip = BQ27510; break;
+ case BQ27531: di->chip = BQ27530; break;
+ case BQ27542: di->chip = BQ27541; break;
+ case BQ27546: di->chip = BQ27541; break;
+ case BQ27742: di->chip = BQ27541; break;
+ case BQ27425: di->chip = BQ27421; break;
+ case BQ27441: di->chip = BQ27421; break;
+ case BQ27621: di->chip = BQ27421; break;
+ default: break;
+ }
+
INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll);
mutex_init(&di->lock);
di->regs = bq27xxx_regs[di->chip];
diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
index 5c5c3a6..13def59 100644
--- a/drivers/power/supply/bq27xxx_battery_i2c.c
+++ b/drivers/power/supply/bq27xxx_battery_i2c.c
@@ -150,18 +150,18 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = {
{ "bq27210", BQ27010 },
{ "bq27500", BQ27500 },
{ "bq27510", BQ27510 },
- { "bq27520", BQ27510 },
+ { "bq27520", BQ27520 },
{ "bq27530", BQ27530 },
- { "bq27531", BQ27530 },
+ { "bq27531", BQ27531 },
{ "bq27541", BQ27541 },
- { "bq27542", BQ27541 },
- { "bq27546", BQ27541 },
- { "bq27742", BQ27541 },
+ { "bq27542", BQ27542 },
+ { "bq27546", BQ27546 },
+ { "bq27742", BQ27742 },
{ "bq27545", BQ27545 },
{ "bq27421", BQ27421 },
- { "bq27425", BQ27421 },
- { "bq27441", BQ27421 },
- { "bq27621", BQ27421 },
+ { "bq27425", BQ27425 },
+ { "bq27441", BQ27441 },
+ { "bq27621", BQ27621 },
{},
};
MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table);
diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index 92df553..90b7ca1 100644
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -3,13 +3,23 @@
enum bq27xxx_chip {
BQ27000 = 1, /* bq27000, bq27200 */
- BQ27010, /* bq27010, bq27210 */
- BQ27500, /* bq27500 */
- BQ27510, /* bq27510, bq27520 */
- BQ27530, /* bq27530, bq27531 */
- BQ27541, /* bq27541, bq27542, bq27546, bq27742 */
- BQ27545, /* bq27545 */
- BQ27421, /* bq27421, bq27425, bq27441, bq27621 */
+ BQ27010 = 2, /* bq27010, bq27210 */
+ BQ27500 = 3, /* bq27500 */
+ BQ27510 = 4, /* bq27510, bq27520 */
+ BQ27530 = 5, /* bq27530, bq27531 */
+ BQ27541 = 6, /* bq27541, bq27542, bq27546, bq27742 */
+ BQ27545 = 7, /* bq27545 */
+ BQ27421 = 8, /* bq27421, bq27425, bq27441, bq27621 */
+
+ /* members of above groups; translate these in _setup() for .chip */
+ BQ27520 = 101,
+ BQ27531 = 102,
+ BQ27542 = 103,
+ BQ27546 = 104,
+ BQ27742 = 105,
+ BQ27425 = 106,
+ BQ27441 = 107,
+ BQ27621 = 108,
};
/**
--
2.9.3
next reply other threads:[~2017-03-10 0:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 0:27 Liam Breck [this message]
2017-03-10 0:27 ` [PATCH v9.3 7/8] power: bq27xxx_battery: Add power_supply_battery_info support Liam Breck
2017-03-10 21:01 ` Liam Breck
2017-03-10 21:25 ` Andrew F. Davis
2017-03-10 21:49 ` Liam Breck
2017-03-13 17:53 ` Andrew F. Davis
2017-03-13 19:57 ` Liam Breck
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=20170310002726.30949-1-liam@networkimprov.net \
--to=liam@networkimprov.net \
--cc=afd@ti.com \
--cc=kernel@networkimprov.net \
--cc=linux-pm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.