power: supply: bq25890: Support boards with more then one charger IC

Some devices, such as the Lenovo Yoga Tab 3 Pro (YT3-X90F) have
multiple batteries with a separate bq25890 charger for each battery.

This requires the bq25890_charger code to use a unique name per
registered power_supply class device, rather then hardcoding
"bq25890-charger" as power_supply class device name.

Add a "-%d" prefix to the name, allocated through idr in the same way
as several other power_supply drivers are already doing this.

Note this also updates: drivers/platform/x86/x86-android-tablets.c
which refers to the charger by power_supply-class-device-name for
the purpose of setting the "supplied-from" property on the fuel-gauge
to this name.

Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/platform/x86/x86-android-tablets.c b/drivers/platform/x86/x86-android-tablets.c
index 123a461..111b007 100644 (file)
--- a/drivers/platform/x86/x86-android-tablets.c
+++ b/drivers/platform/x86/x86-android-tablets.c
@@ -187,7 +187,7 @@ struct x86_dev_info {
 /* Generic / shared charger / battery settings */
 static const char * const tusb1211_chg_det_psy[] = { "tusb1211-charger-detect" };
 static const char * const bq24190_psy[] = { "bq24190-charger" };
-static const char * const bq25890_psy[] = { "bq25890-charger" };
+static const char * const bq25890_psy[] = { "bq25890-charger-0" };
 
 static const struct property_entry fg_bq24190_supply_props[] = {
        PROPERTY_ENTRY_STRING_ARRAY("supplied-from", bq24190_psy),

diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
index 9b3a173..30854d0 100644 (file)
--- a/drivers/power/supply/bq25890_charger.c
+++ b/drivers/power/supply/bq25890_charger.c
@@ -108,6 +108,9 @@ struct bq25890_device {
        struct i2c_client *client;
        struct device *dev;
        struct power_supply *charger;
+       struct power_supply_desc desc;
+       char name[28]; /* "bq25890-charger-%d" */
+       int id;
 
        struct usb_phy *usb_phy;
        struct notifier_block usb_nb;
@@ -129,6 +132,9 @@ struct bq25890_device {
        struct mutex lock; /* protect state data */
 };
 
+static DEFINE_IDR(bq25890_id);
+static DEFINE_MUTEX(bq25890_id_mutex);
+
 static const struct regmap_range bq25890_readonly_reg_ranges[] = {
        regmap_reg_range(0x0b, 0x0c),
        regmap_reg_range(0x0e, 0x13),
@@ -989,7 +995,6 @@ static char *bq25890_charger_supplied_to[] = {
 };
 
 static const struct power_supply_desc bq25890_power_supply_desc = {
-       .name = "bq25890-charger",
        .type = POWER_SUPPLY_TYPE_USB,
        .properties = bq25890_power_supply_props,
        .num_properties = ARRAY_SIZE(bq25890_power_supply_props),
@@ -1003,12 +1008,21 @@ static int bq25890_power_supply_init(struct bq25890_device *bq)
 {
        struct power_supply_config psy_cfg = { .drv_data = bq, };
 
+       /* Get ID for the device */
+       mutex_lock(&bq25890_id_mutex);
+       bq->id = idr_alloc(&bq25890_id, bq, 0, 0, GFP_KERNEL);
+       mutex_unlock(&bq25890_id_mutex);
+       if (bq->id < 0)
+               return bq->id;
+
+       snprintf(bq->name, sizeof(bq->name), "bq25890-charger-%d", bq->id);
+       bq->desc = bq25890_power_supply_desc;
+       bq->desc.name = bq->name;
+
        psy_cfg.supplied_to = bq25890_charger_supplied_to;
        psy_cfg.num_supplicants = ARRAY_SIZE(bq25890_charger_supplied_to);
 
-       bq->charger = devm_power_supply_register(bq->dev,
-                                                &bq25890_power_supply_desc,
-                                                &psy_cfg);
+       bq->charger = devm_power_supply_register(bq->dev, &bq->desc, &psy_cfg);
 
        return PTR_ERR_OR_ZERO(bq->charger);
 }
@@ -1354,6 +1368,12 @@ static void bq25890_non_devm_cleanup(void *data)
        struct bq25890_device *bq = data;
 
        cancel_delayed_work_sync(&bq->pump_express_work);
+
+       if (bq->id >= 0) {
+               mutex_lock(&bq25890_id_mutex);
+               idr_remove(&bq25890_id, bq->id);
+               mutex_unlock(&bq25890_id_mutex);
+       }
 }
 
 static int bq25890_probe(struct i2c_client *client)
@@ -1368,6 +1388,7 @@ static int bq25890_probe(struct i2c_client *client)
 
        bq->client = client;
        bq->dev = dev;
+       bq->id = -1;
 
        mutex_init(&bq->lock);
        INIT_DELAYED_WORK(&bq->pump_express_work, bq25890_pump_express_work);