diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2022-11-27 19:02:24 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-11-28 00:02:52 +0100 |
| commit | 571650b3a30f67d70df242508631ed5e7de2c2df (patch) | |
| tree | 719df55cfed474ae12e73d51fd423b1b06c7b87a /drivers/power | |
| parent | power: supply: ab8500: Fix error handling in ab8500_charger_init() (diff) | |
| download | linux-571650b3a30f67d70df242508631ed5e7de2c2df.tar.xz linux-571650b3a30f67d70df242508631ed5e7de2c2df.zip | |
power: supply: bq25890: Only use pdata->regulator_init_data for vbus
bq25890_platform_data.regulator_init_data is intended to only provide
regulator init_data for the vbus regulator.
Remove this from the regulator_config before registering the vsys
regulator. Otherwise the regulator_register() call for vsys will fail
because it tries to register duplicate consumer_dev_name + supply
names from init_data->consumer_supplies[], leading to the entire
probe of the bq25890 driver failing:
[ 32.017501] bq25890-charger i2c-bq25892_main: Failed to set supply vbus
[ 32.017525] bq25890-charger i2c-bq25892_main: error -EBUSY: registering vsys regulator
[ 32.124978] bq25890-charger: probe of i2c-bq25892_main failed with error -16
Fixes: 14a3d159abf8 ("power: supply: bq25890: Add Vsys regulator")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/bq25890_charger.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c index bfdd2213ba69..512c81662eea 100644 --- a/drivers/power/supply/bq25890_charger.c +++ b/drivers/power/supply/bq25890_charger.c @@ -1161,6 +1161,8 @@ static int bq25890_register_regulator(struct bq25890_device *bq) "registering vbus regulator"); } + /* pdata->regulator_init_data is for vbus only */ + cfg.init_data = NULL; reg = devm_regulator_register(bq->dev, &bq25890_vsys_desc, &cfg); if (IS_ERR(reg)) { return dev_err_probe(bq->dev, PTR_ERR(reg), |