power: supply: bq27xxx: add support for TI bq34z100

Add support for new device: the TI bq34z100-G1, a Wide Range Fuel Gauge
for Li-Ion, PbA, NiMH, and NiCd batteries.  The device shares a lot with
other models, although it has its own differences requiring new quirks.

This patch was tested on a system equipped with NiMH batteries.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index cda03e1f95860b810a74cefd68f4bb0292d757fa..315e0909e6a481201fb418492640e8d36383caf1 100644 (file)
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -38,6 +38,7 @@
  * https://www.ti.com/product/bq27621-g1
  * https://www.ti.com/product/bq27z561
  * https://www.ti.com/product/bq28z610
  * https://www.ti.com/product/bq27621-g1
  * https://www.ti.com/product/bq27z561
  * https://www.ti.com/product/bq28z610

+ * https://www.ti.com/product/bq34z100-g1

  */
 
 #include <linux/device.h>
  */
 
 #include <linux/device.h>


@@ -476,6 +477,26 @@ static u8
                [BQ27XXX_REG_DCAP] = 0x3c,
                [BQ27XXX_REG_AP] = 0x22,
                BQ27XXX_DM_REG_ROWS,
                [BQ27XXX_REG_DCAP] = 0x3c,
                [BQ27XXX_REG_AP] = 0x22,
                BQ27XXX_DM_REG_ROWS,

+       },
+       bq34z100_regs[BQ27XXX_REG_MAX] = {
+               [BQ27XXX_REG_CTRL] = 0x00,
+               [BQ27XXX_REG_TEMP] = 0x0c,
+               [BQ27XXX_REG_INT_TEMP] = 0x2a,
+               [BQ27XXX_REG_VOLT] = 0x08,
+               [BQ27XXX_REG_AI] = 0x0a,
+               [BQ27XXX_REG_FLAGS] = 0x0e,
+               [BQ27XXX_REG_TTE] = 0x18,
+               [BQ27XXX_REG_TTF] = 0x1a,
+               [BQ27XXX_REG_TTES] = 0x1e,
+               [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_NAC] = INVALID_REG_ADDR,
+               [BQ27XXX_REG_FCC] = 0x06,
+               [BQ27XXX_REG_CYCT] = 0x2c,
+               [BQ27XXX_REG_AE] = 0x24,
+               [BQ27XXX_REG_SOC] = 0x02,
+               [BQ27XXX_REG_DCAP] = 0x3c,
+               [BQ27XXX_REG_AP] = 0x22,
+               BQ27XXX_DM_REG_ROWS,

        };
 
 static enum power_supply_property bq27000_props[] = {
        };
 
 static enum power_supply_property bq27000_props[] = {


@@ -750,6 +771,27 @@ static enum power_supply_property bq28z610_props[] = {
        POWER_SUPPLY_PROP_MANUFACTURER,
 };
 
        POWER_SUPPLY_PROP_MANUFACTURER,
 };
 

+static enum power_supply_property bq34z100_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_PRESENT,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_CURRENT_NOW,
+       POWER_SUPPLY_PROP_CAPACITY,
+       POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+       POWER_SUPPLY_PROP_TEMP,
+       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
+       POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
+       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
+       POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_CHARGE_FULL,
+       POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+       POWER_SUPPLY_PROP_CYCLE_COUNT,
+       POWER_SUPPLY_PROP_ENERGY_NOW,
+       POWER_SUPPLY_PROP_POWER_AVG,
+       POWER_SUPPLY_PROP_HEALTH,
+       POWER_SUPPLY_PROP_MANUFACTURER,
+};
+

 struct bq27xxx_dm_reg {
        u8 subclass_id;
        u8 offset;
 struct bq27xxx_dm_reg {
        u8 subclass_id;
        u8 offset;


@@ -857,6 +899,7 @@ static struct bq27xxx_dm_reg bq27621_dm_regs[] = {
 #define BQ27Z561_O_BITS                BIT(5)
 #define BQ27XXX_O_SOC_SI       BIT(6) /* SoC is single register */
 #define BQ27XXX_O_HAS_CI       BIT(7) /* has Capacity Inaccurate flag */
 #define BQ27Z561_O_BITS                BIT(5)
 #define BQ27XXX_O_SOC_SI       BIT(6) /* SoC is single register */
 #define BQ27XXX_O_HAS_CI       BIT(7) /* has Capacity Inaccurate flag */

+#define BQ27XXX_O_MUL_CHEM     BIT(8) /* multiple chemistries supported */

 
 #define BQ27XXX_DATA(ref, key, opt) {          \
        .opts = (opt),                          \
 
 #define BQ27XXX_DATA(ref, key, opt) {          \
        .opts = (opt),                          \


@@ -903,6 +946,8 @@ static struct {
        [BQ27621]   = BQ27XXX_DATA(bq27621,   0x80008000, BQ27XXX_O_UTOT | BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
        [BQ27Z561]  = BQ27XXX_DATA(bq27z561,  0         , BQ27Z561_O_BITS),
        [BQ28Z610]  = BQ27XXX_DATA(bq28z610,  0         , BQ27Z561_O_BITS),
        [BQ27621]   = BQ27XXX_DATA(bq27621,   0x80008000, BQ27XXX_O_UTOT | BQ27XXX_O_CFGUP | BQ27XXX_O_RAM),
        [BQ27Z561]  = BQ27XXX_DATA(bq27z561,  0         , BQ27Z561_O_BITS),
        [BQ28Z610]  = BQ27XXX_DATA(bq28z610,  0         , BQ27Z561_O_BITS),

+       [BQ34Z100]  = BQ27XXX_DATA(bq34z100,  0         , BQ27XXX_O_OTDC | BQ27XXX_O_SOC_SI | \
+                                                         BQ27XXX_O_HAS_CI | BQ27XXX_O_MUL_CHEM),

 };
 
 static DEFINE_MUTEX(bq27xxx_list_lock);
 };
 
 static DEFINE_MUTEX(bq27xxx_list_lock);


@@ -1914,7 +1959,10 @@ static int bq27xxx_battery_get_property(struct power_supply *psy,
                ret = bq27xxx_simple_value(di->cache.time_to_full, val);
                break;
        case POWER_SUPPLY_PROP_TECHNOLOGY:
                ret = bq27xxx_simple_value(di->cache.time_to_full, val);
                break;
        case POWER_SUPPLY_PROP_TECHNOLOGY:

-               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
+               if (di->opts & BQ27XXX_O_MUL_CHEM)
+                       val->intval = POWER_SUPPLY_TECHNOLOGY_UNKNOWN;
+               else
+                       val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

                break;
        case POWER_SUPPLY_PROP_CHARGE_NOW:
                ret = bq27xxx_simple_value(bq27xxx_battery_read_nac(di), val);
                break;
        case POWER_SUPPLY_PROP_CHARGE_NOW:
                ret = bq27xxx_simple_value(bq27xxx_battery_read_nac(di), val);

diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
index 765873dfc495f65c0356d301645f4071f0e27fe5..eb4f4284982fa9eeefac3184ad1b0bf5996be10f 100644 (file)
--- a/drivers/power/supply/bq27xxx_battery_i2c.c
+++ b/drivers/power/supply/bq27xxx_battery_i2c.c
@@ -247,6 +247,7 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = {
        { "bq27621", BQ27621 },
        { "bq27z561", BQ27Z561 },
        { "bq28z610", BQ28Z610 },
        { "bq27621", BQ27621 },
        { "bq27z561", BQ27Z561 },
        { "bq28z610", BQ28Z610 },

+       { "bq34z100", BQ34Z100 },

        {},
 };
 MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table);
        {},
 };
 MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table);


@@ -282,6 +283,7 @@ static const struct of_device_id bq27xxx_battery_i2c_of_match_table[] = {
        { .compatible = "ti,bq27621" },
        { .compatible = "ti,bq27z561" },
        { .compatible = "ti,bq28z610" },
        { .compatible = "ti,bq27621" },
        { .compatible = "ti,bq27z561" },
        { .compatible = "ti,bq28z610" },

+       { .compatible = "ti,bq34z100" },

        {},
 };
 MODULE_DEVICE_TABLE(of, bq27xxx_battery_i2c_of_match_table);
        {},
 };
 MODULE_DEVICE_TABLE(of, bq27xxx_battery_i2c_of_match_table);

diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index 987d9652aa4e74d44e6e72a0cf3b0d2b010c404f..111a40d0d3d5083db61fef3306737c8441c9b582 100644 (file)
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -32,6 +32,7 @@ enum bq27xxx_chip {
        BQ27621,
        BQ27Z561,
        BQ28Z610,
        BQ27621,
        BQ27Z561,
        BQ28Z610,

+       BQ34Z100,

 };
 
 struct bq27xxx_device_info;
 };
 
 struct bq27xxx_device_info;