Re: [PATCH v12 4/4] i2c: muxes: pca954x: Add regulator support

[Christophe JAILLET <christophe.jaillet@wanadoo.fr>]

Le 17/04/2023 à 12:48, Patrick Rudolph a écrit :
> Add a vdd regulator and enable it for boards that have the
> mux powered off by default.
> 
> Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
> ---
>   drivers/i2c/muxes/i2c-mux-pca954x.c | 29 ++++++++++++++++++++++++-----
>   1 file changed, 24 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> index 39f313658b18..42f467dc7995 100644
> --- a/drivers/i2c/muxes/i2c-mux-pca954x.c
> +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
> @@ -49,6 +49,7 @@
>   #include <linux/module.h>
>   #include <linux/pm.h>
>   #include <linux/property.h>
> +#include <linux/regulator/consumer.h>
>   #include <linux/slab.h>
>   #include <linux/spinlock.h>
>   #include <dt-bindings/mux/mux.h>
> @@ -101,6 +102,7 @@ struct pca954x {
>   	struct irq_domain *irq;
>   	unsigned int irq_mask;
>   	raw_spinlock_t lock;
> +	struct regulator *supply;
>   };
>   
>   /* Provide specs for the MAX735x, PCA954x and PCA984x types we know about */
> @@ -440,6 +442,8 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc)
>   	struct pca954x *data = i2c_mux_priv(muxc);
>   	int c, irq;
>   
> +	regulator_disable(data->supply);
> +
>   	if (data->irq) {
>   		for (c = 0; c < data->chip->nchans; c++) {
>   			irq = irq_find_mapping(data->irq, c);
> @@ -492,10 +496,23 @@ static int pca954x_probe(struct i2c_client *client)
>   	i2c_set_clientdata(client, muxc);
>   	data->client = client;
>   
> +	data->supply = devm_regulator_get(dev, "vdd");
> +	if (IS_ERR(data->supply))
> +		return dev_err_probe(dev, PTR_ERR(data->supply),
> +				"Failed to request regulator\n");
> +
> +	ret = regulator_enable(data->supply);
> +	if (ret) {
> +		dev_err(dev, "Failed to enable vdd supply: %d\n", ret);
> +		return ret;

Should there be another version:

Nit: return dev_err_probe... for consistancy?

> +	}
> +
>   	/* Reset the mux if a reset GPIO is specified. */
>   	gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
> -	if (IS_ERR(gpio))
> -		return PTR_ERR(gpio);
> +	if (IS_ERR(gpio)) {
> +		ret = PTR_ERR(gpio);
> +		goto fail_cleanup;
> +	}
>   	if (gpio) {
>   		udelay(1);
>   		gpiod_set_value_cansleep(gpio, 0);
> @@ -512,7 +529,7 @@ static int pca954x_probe(struct i2c_client *client)
>   
>   		ret = i2c_get_device_id(client, &id);
>   		if (ret && ret != -EOPNOTSUPP)
> -			return ret;
> +			goto fail_cleanup;
>   
>   		if (!ret &&
>   		    (id.manufacturer_id != data->chip->id.manufacturer_id ||
> @@ -520,7 +537,8 @@ static int pca954x_probe(struct i2c_client *client)
>   			dev_warn(dev, "unexpected device id %03x-%03x-%x\n",
>   				 id.manufacturer_id, id.part_id,
>   				 id.die_revision);
> -			return -ENODEV;
> +			ret = -ENODEV;
> +			goto fail_cleanup;
>   		}
>   	}
>   
> @@ -539,7 +557,8 @@ static int pca954x_probe(struct i2c_client *client)
>   	ret = pca954x_init(client, data);
>   	if (ret < 0) {
>   		dev_warn(dev, "probe failed\n");
> -		return -ENODEV;
> +		ret = -ENODEV;
> +		goto fail_cleanup;
>   	}
>   
>   	ret = pca954x_irq_setup(muxc);