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: Re: [PATCH v13 09/11] power: supply: bq27xxx_battery: Enable data memory update for certain chips
Date: Wed, 10 May 2017 02:16:45 -0700 [thread overview]
Message-ID: <CAKvHMgQGzPtPsSOjF-5+jLiBSOdZLh+9WrLAZwby+Zp1+GzNAg@mail.gmail.com> (raw)
In-Reply-To: <20170504061811.18107-10-liam@networkimprov.net>
Hi Andrew,
On Wed, May 3, 2017 at 11:18 PM, Liam Breck <liam@networkimprov.net> wrote:
> From: Liam Breck <kernel@networkimprov.net>
>
> Support data memory update on BQ27500, 545, 425, 421, 441, 621.
Re testing, I'll comment out code in this patch for chips I can't
test. We can let future users test chips they use and re-enable/insert
them. No need to make you test everything.
> Create IDs for for previously unID'd chips, to index arrays for unseal keys
> and data memory register tables.
>
> Signed-off-by: Liam Breck <kernel@networkimprov.net>
> ---
> drivers/power/supply/bq27xxx_battery.c | 90 ++++++++++++++++++++++++++++--
> drivers/power/supply/bq27xxx_battery_i2c.c | 16 +++---
> include/linux/power/bq27xxx_battery.h | 13 +++++
> 3 files changed, 107 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
> index 06f15da..0aecd41 100644
> --- a/drivers/power/supply/bq27xxx_battery.c
> +++ b/drivers/power/supply/bq27xxx_battery.c
> @@ -58,7 +58,7 @@
>
> #include <linux/power/bq27xxx_battery.h>
>
> -#define DRIVER_VERSION "1.2.0"
> +#define DRIVER_VERSION "1.3.0"
>
> #define BQ27XXX_MANUFACTURER "Texas Instruments"
>
> @@ -132,7 +132,7 @@ enum bq27xxx_reg_index {
> [BQ27XXX_DM_CKSUM] = 0x60
>
> /* Register mappings */
> -static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = {
> +static u8 bq27xxx_regs[BQ27MAX][BQ27XXX_REG_MAX] = {
> [BQ27000] = {
> [BQ27XXX_REG_CTRL] = 0x00,
> [BQ27XXX_REG_TEMP] = 0x06,
> @@ -779,7 +779,7 @@ static enum power_supply_property bq27421_battery_props[] = {
> static struct {
> enum power_supply_property *props;
> size_t size;
> -} bq27xxx_battery_props[] = {
> +} bq27xxx_battery_props[BQ27MAX] = {
> BQ27XXX_PROP(BQ27000, bq27000_battery_props),
> BQ27XXX_PROP(BQ27010, bq27010_battery_props),
> BQ27XXX_PROP(BQ2750X, bq2750x_battery_props),
> @@ -798,6 +798,33 @@ static struct {
> BQ27XXX_PROP(BQ27421, bq27421_battery_props),
> };
>
> +static enum bq27xxx_chip bq27xxx_chips[] = {
> + [BQ27000] = BQ27000,
> + [BQ27010] = BQ27010,
> + [BQ2750X] = BQ2750X,
> + [BQ2751X] = BQ2751X,
> + [BQ2752X] = BQ2751X,
> + [BQ27500] = BQ27500,
> + [BQ27510G1] = BQ27510G1,
> + [BQ27510G2] = BQ27510G2,
> + [BQ27510G3] = BQ27510G3,
> + [BQ27520G1] = BQ27520G1,
> + [BQ27520G2] = BQ27520G2,
> + [BQ27520G3] = BQ27520G3,
> + [BQ27520G4] = BQ27520G4,
> + [BQ27530] = BQ27530,
> + [BQ27531] = BQ27530,
> + [BQ27541] = BQ27541,
> + [BQ27542] = BQ27541,
> + [BQ27546] = BQ27541,
> + [BQ27742] = BQ27541,
> + [BQ27545] = BQ27545,
> + [BQ27421] = BQ27421,
> + [BQ27425] = BQ27421,
> + [BQ27441] = BQ27421,
> + [BQ27621] = BQ27421,
> +};
> +
> static DEFINE_MUTEX(bq27xxx_list_lock);
> static LIST_HEAD(bq27xxx_battery_devices);
>
> @@ -856,6 +883,54 @@ static const char * const bq27xxx_dm_reg_name[] = {
> [BQ27XXX_DM_TERMINATE_VOLTAGE] = "terminate-voltage",
> };
Specifically...
#ifdef DEBUG here
> +static struct bq27xxx_dm_reg bq27500_dm_regs[] = {
> + [BQ27XXX_DM_DESIGN_CAPACITY] = { 48, 10, 2, 0, 65535 },
> + [BQ27XXX_DM_DESIGN_ENERGY] = { }, /* missing on chip */
> + [BQ27XXX_DM_TERMINATE_VOLTAGE] = { 80, 48, 2, 1000, 32767 },
> +};
> +
> +static struct bq27xxx_dm_reg bq27545_dm_regs[] = {
> + [BQ27XXX_DM_DESIGN_CAPACITY] = { 48, 23, 2, 0, 32767 },
> + [BQ27XXX_DM_DESIGN_ENERGY] = { 48, 25, 2, 0, 32767 },
> + [BQ27XXX_DM_TERMINATE_VOLTAGE] = { 80, 67, 2, 2800, 3700 },
> +};
> +
> +static struct bq27xxx_dm_reg bq27421_dm_regs[] = {
> + [BQ27XXX_DM_DESIGN_CAPACITY] = { 82, 10, 2, 0, 8000 },
> + [BQ27XXX_DM_DESIGN_ENERGY] = { 82, 12, 2, 0, 32767 },
> + [BQ27XXX_DM_TERMINATE_VOLTAGE] = { 82, 16, 2, 2500, 3700 },
> +};
> +
> +static struct bq27xxx_dm_reg bq27425_dm_regs[] = {
> + [BQ27XXX_DM_DESIGN_CAPACITY] = { 82, 12, 2, 0, 32767 },
> + [BQ27XXX_DM_DESIGN_ENERGY] = { 82, 14, 2, 0, 32767 },
> + [BQ27XXX_DM_TERMINATE_VOLTAGE] = { 82, 18, 2, 2800, 3700 },
> +};
> +
> +static struct bq27xxx_dm_reg bq27621_dm_regs[] = {
> + [BQ27XXX_DM_DESIGN_CAPACITY] = { 82, 3, 2, 0, 8000 },
> + [BQ27XXX_DM_DESIGN_ENERGY] = { 82, 5, 2, 0, 32767 },
> + [BQ27XXX_DM_TERMINATE_VOLTAGE] = { 82, 9, 2, 2500, 3700 },
> +};
#endif here, moving one table outside the ifdef.
> +static struct bq27xxx_dm_reg *bq27xxx_dm_regs[] = {
> + [BQ27500] = bq27500_dm_regs,
> + [BQ27545] = bq27545_dm_regs,
> + [BQ27421] = bq27421_dm_regs,
> + [BQ27425] = bq27425_dm_regs,
> + [BQ27441] = bq27421_dm_regs,
> + [BQ27621] = bq27621_dm_regs,
> +};
> +
And the same inside the above table.
> +static u32 bq27xxx_unseal_keys[] = {
> + [BQ27500] = 0x04143672,
> + [BQ27545] = 0x04143672,
> + [BQ27421] = 0x80008000,
> + [BQ27425] = 0x04143672,
> + [BQ27441] = 0x80008000,
> + [BQ27621] = 0x80008000,
> +};
> +
>
> #ifdef CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
> static bool bq27xxx_dt_to_nvm = true;
> @@ -1865,9 +1940,16 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
> .drv_data = di,
> };
>
> + di->ram_chip = di->chip == BQ27421 || di->chip == BQ27441 || di->chip == BQ27621;
> +
> + di->unseal_key = bq27xxx_unseal_keys[di->chip];
> + di->dm_regs = bq27xxx_dm_regs[di->chip];
> + di->chip = bq27xxx_chips[di->chip];
> +
> + di->regs = bq27xxx_regs[di->chip];
> +
> INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll);
> mutex_init(&di->lock);
> - di->regs = bq27xxx_regs[di->chip];
>
> psy_desc = devm_kzalloc(di->dev, sizeof(*psy_desc), GFP_KERNEL);
> if (!psy_desc)
> diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
> index a597221..0b11ed4 100644
> --- a/drivers/power/supply/bq27xxx_battery_i2c.c
> +++ b/drivers/power/supply/bq27xxx_battery_i2c.c
> @@ -230,7 +230,7 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = {
> { "bq27210", BQ27010 },
> { "bq27500", BQ2750X },
> { "bq27510", BQ2751X },
> - { "bq27520", BQ2751X },
> + { "bq27520", BQ2752X },
> { "bq27500-1", BQ27500 },
> { "bq27510g1", BQ27510G1 },
> { "bq27510g2", BQ27510G2 },
> @@ -240,16 +240,16 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = {
> { "bq27520g3", BQ27520G3 },
> { "bq27520g4", BQ27520G4 },
> { "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 11e1168..543c10e 100644
> --- a/include/linux/power/bq27xxx_battery.h
> +++ b/include/linux/power/bq27xxx_battery.h
> @@ -2,6 +2,8 @@
> #define __LINUX_BQ27X00_BATTERY_H__
>
> enum bq27xxx_chip {
> + /* these index bq27xxx_regs[] & bq27xxx_battery_props[] */
> + /* and map to themselves in bq27xxx_chips[] */
> BQ27000 = 1, /* bq27000, bq27200 */
> BQ27010, /* bq27010, bq27210 */
> BQ2750X, /* bq27500 deprecated alias */
> @@ -18,6 +20,17 @@ enum bq27xxx_chip {
> BQ27541, /* bq27541, bq27542, bq27546, bq27742 */
> BQ27545, /* bq27545 */
> BQ27421, /* bq27421, bq27425, bq27441, bq27621 */
> + BQ27MAX,
> +
> + /* these map to above in bq27xxx_chips[] */
> + BQ2752X, /* deprecated alias */
> + BQ27531,
> + BQ27542,
> + BQ27546,
> + BQ27742,
> + BQ27425,
> + BQ27441,
> + BQ27621,
> };
>
> /**
> --
> 2.9.3
>
next prev parent reply other threads:[~2017-05-10 9:16 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 6:18 [PATCH v13 0/11] devicetree simple-battery and client in bq27xxx_battery Liam Breck
2017-05-04 6:18 ` [PATCH v13 01/11] devicetree: property-units: Add uWh and uAh units Liam Breck
2017-05-04 6:18 ` Liam Breck
2017-05-04 6:18 ` [PATCH v13 02/11] dt-bindings: power: supply: Add battery.txt with simple-battery binding Liam Breck
2017-05-04 6:18 ` [PATCH v13 03/11] power: supply: core: Add power_supply_battery_info and API Liam Breck
2017-05-04 6:18 ` [PATCH v13 04/11] power: supply: core: Add power_supply_prop_precharge Liam Breck
[not found] ` <20170504061811.18107-1-liam-RYWXG+zxWwBdeoIcmNTgJF6hYfS7NtTn@public.gmane.org>
2017-05-04 6:18 ` [PATCH v13 05/11] dt-bindings: power: supply: bq27xxx: Add monitored-battery documentation Liam Breck
2017-05-04 6:18 ` [PATCH v13 06/11] power: supply: bq27xxx_battery: Add bulk transfer bus methods Liam Breck
2017-05-04 6:18 ` [PATCH v13 07/11] power: supply: bq27xxx_battery: Add chip data memory read/write support Liam Breck
2017-05-04 16:44 ` Andrew F. Davis
2017-05-04 18:07 ` Liam Breck
2017-05-05 12:45 ` Liam Breck
2017-05-05 15:40 ` Andrew F. Davis
2017-05-05 18:44 ` Liam Breck
2017-05-04 6:18 ` [PATCH v13 08/11] power: supply: bq27xxx_battery: Add power_supply_battery_info support Liam Breck
2017-05-04 16:52 ` Andrew F. Davis
2017-05-04 18:40 ` Liam Breck
2017-05-08 6:16 ` Liam Breck
2017-05-08 14:54 ` Andrew F. Davis
2017-05-08 18:39 ` Liam Breck
2017-05-08 18:42 ` Andrew F. Davis
2017-05-08 19:31 ` Liam Breck
2017-05-08 19:50 ` Andrew F. Davis
2017-05-08 20:34 ` Liam Breck
2017-05-09 16:06 ` Andrew F. Davis
2017-05-04 6:18 ` [PATCH v13 09/11] power: supply: bq27xxx_battery: Enable data memory update for certain chips Liam Breck
2017-05-04 17:00 ` Andrew F. Davis
2017-05-04 19:12 ` Liam Breck
2017-05-05 19:31 ` Liam Breck
2017-05-05 19:45 ` Andrew F. Davis
2017-05-05 20:14 ` Liam Breck
2017-05-05 20:44 ` Andrew F. Davis
2017-05-05 20:55 ` Liam Breck
2017-05-05 21:04 ` Andrew F. Davis
2017-05-05 21:27 ` Liam Breck
2017-05-05 21:29 ` Andrew F. Davis
2017-05-05 21:38 ` Liam Breck
2017-05-08 6:40 ` Liam Breck
2017-05-08 15:00 ` Andrew F. Davis
2017-05-08 19:02 ` Liam Breck
2017-05-08 19:09 ` Andrew F. Davis
2017-05-08 20:01 ` Liam Breck
2017-05-09 16:20 ` Andrew F. Davis
2017-05-10 9:16 ` Liam Breck [this message]
2017-05-04 6:18 ` [PATCH v13 10/11] power: supply: bq27xxx_battery: Flag identical register maps when in debug mode Liam Breck
2017-05-04 16:38 ` Andrew F. Davis
2017-05-08 6:18 ` Liam Breck
2017-05-08 15:01 ` Andrew F. Davis
2017-05-08 19:07 ` Liam Breck
2017-05-08 19:12 ` Andrew F. Davis
2017-05-08 20:08 ` Liam Breck
2017-05-04 6:18 ` [PATCH v13 11/11] power: supply: bq27xxx_battery: Remove duplicate register arrays 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=CAKvHMgQGzPtPsSOjF-5+jLiBSOdZLh+9WrLAZwby+Zp1+GzNAg@mail.gmail.com \
--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.