Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <a0f74cfa-696c-f487-51a5-007963cf1456@axentia.se>
Date:   Sat, 19 Mar 2022 15:41:21 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [v6 3/3] i2c: muxes: pca954x: Add regulator support
Content-Language: sv-SE
To:     Patrick Rudolph <patrick.rudolph@9elements.com>
Cc:     linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20220216074613.235725-1-patrick.rudolph@9elements.com>
 <20220216074613.235725-4-patrick.rudolph@9elements.com>
From:   Peter Rosin <peda@axentia.se>
Organization: Axentia Technologies AB
In-Reply-To: <20220216074613.235725-4-patrick.rudolph@9elements.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UG9pVHdYNEhuWm8rQVI2RW01c0dVa21xSHJxRnhOcUZVTFlhQ2ROOEtRZjVz?=
 =?utf-8?B?aFpFRjRIWlh2SHNOaElPYlZHSmxlR0NUM1o4aE8rdzhQZkZDRmhIc00xZXRo?=
 =?utf-8?B?WW5CRkpmQkdGd2E1RENpRXljeXVPVW9mSEdSRHcwa1ptcmFzNWJ1V3JIOGVI?=
 =?utf-8?B?ekVPS2p3Wmg0ZGRxazdSeERYMDVIYWNNbHBTd1JrazQvc3NjVHdyK1FMZ2pH?=
 =?utf-8?B?bFBTVzBnNjR5UzIrTG5SZERLKzJGbjdFSGdrWDYzdjE1SDZWYWhUZkcwMTN3?=
 =?utf-8?B?am5DK0FsR0RYRi9hK1o1M1B5MXhCVnJBVkFVMFNXcEFuYU1GdFhKd20zZmxD?=
 =?utf-8?B?Q0NNaGlMU0lYcXRlOExWY1pSdnpwK1M0bWJqdEFpT3NBc1R3cnpFQVZDTVFS?=
 =?utf-8?B?YnJPWk0wZDVqbUp4ZVB3YXJPR0c3TVJERHRHSStxWXZNY1RjdHJ0akNHalNk?=
 =?utf-8?B?QkgwYXRtN3NuWVMvT0JaTlcvbm5ZSElFaG1pcGh0TlJzQ3FKcGV5Q0l4QXRX?=
 =?utf-8?B?ZWNDN2xScEkwMzY2ak5NNFhsT3A1Z0FLYllVNlMyQkxKYnNOZU1VNzl0MUQw?=
 =?utf-8?B?QU1POGdQZFcwKzdlam4xbUMyMGtzUmtOWm5jU2w2NWd4RnlJM3U2TVYzMEZZ?=
 =?utf-8?B?Yk9iazEwamVNbmpTYVlCM0krL2thR0E3bmxJUXM0SFpPd3VEV1luaTl0RTU0?=
 =?utf-8?B?dzhLOThaWUwvM2NOWXB2ZVpyS2EwSWtDNmtxKzFvRi8reHE4VHBDUyt6VW0v?=
 =?utf-8?B?QldkQU5TS2NNcTdqUkdPL2hGeHRwZDFZOWM3U2JwdUpHWDJUZVFhUzB6d3RK?=
 =?utf-8?B?NXYvWDJDQjRUWk1Lb2NEVGlrajluWEZJU1hETWVWZk5yMEIwalkvYVRNM3pB?=
 =?utf-8?B?Ulh2WFVkUUZWZ2pya1grUmJvVG00OEo0VjMyVTRDN3lnb3pCL0RPay9KUElK?=
 =?utf-8?B?UHVSNkVPbERzalJidm9NSkZGU2RYeHBJakxkenVsSy94dkRzaUZ6anZqeFRW?=
 =?utf-8?B?akh4cmlIa1k5dE05T2VFUU1QVlRVT3ptcXdZbVMvMDRxMWU2Wi9HYkJxUHpr?=
 =?utf-8?B?VzlVVXZKVFlOZ2psazRkVnQ1R1g4SXRLMTJINmVjMnZMMVllNXNVTmxaRTh2?=
 =?utf-8?B?U0FWOUJia3pBRjdHK1hDbjlvNE9IMFFJdU5aZkozV3c5emdyczcyU2c4VXY4?=
 =?utf-8?B?dEk5czFRcXdyWTJHRDhlMTJqaDlIQUU4a0tPWHo4azUyb1lBN1liWWJJTlBM?=
 =?utf-8?B?SzFHckdvQitMYzdhbDI4NFloSDlscGFTMFhOOG5GOTFVTTRXT1FzMGRhYzBF?=
 =?utf-8?B?K0YvSGpoTmZ0UXk4U041R280RDUwU0k1MVFCMUNBNmZBL09WU0QvU3JsZFNh?=
 =?utf-8?B?VlRLdmNsUExhcmU2anBsaHg4d3VYSVZsR0xka2htajdCcGt3VndpazdqeGFT?=
 =?utf-8?B?dDZYL3p4U2RVUEJGQTZWL1BHcktBNENzckp5Rzd2WVZtWExKQWx3ZUNMS0hH?=
 =?utf-8?B?R0twYjQxT3JqZHdpWmdlR0xWbzR2NEoyeTZqSm5Jc0tOOUswcyttTVU2UFVw?=
 =?utf-8?B?MHVuN1daQjZ4TjU2ZVlJRkE2Z0xheVhzNmU4OWErZzN3WlJETGExdkduVHpZ?=
 =?utf-8?B?d05rODZuZGFSRkh4RHJ0c1RNQ1B2ckRuZ1RQblNRUzJmZDFxK0llblJ0VmJP?=
 =?utf-8?B?NWkrVTRSRzJvSnpkblVXc1phc3FpelowUUZJL0lUM1ZhK1NDNGhqczZIZXNR?=
 =?utf-8?B?TmVrdkFUVzhqRkI4Y2pMSml2UjZYQVJ5cWk3VTcrb2xLRSs4b09zS3NmYmxV?=
 =?utf-8?B?RU93WHMwU1ZrOHNJRjZUdVFwekRaQUxzOUM4d0NYUU9FR1RVdmdsajNKL3hk?=
 =?utf-8?B?bW9QTDV6VW0ycUIrT3RKYVh4UVFIdmhjSWdUTGhOcHRsc2JsUldVNzdzcXB4?=
 =?utf-8?Q?LD+F+4hT7JZaREDxoFOHags2E5whqlSy?=
X-OriginatorOrg: axentia.se
X-MS-Exchange-CrossTenant-Network-Message-Id: d20a7ca5-6fa8-4ad3-017a-08da09b68a54
X-MS-Exchange-CrossTenant-AuthSource: AM0PR02MB4436.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2022 14:41:23.7211
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Q0PaceLqRRY3O28DPDs3krn3Lmh14g/e3ABRFiPST12BYJysyDh7c/O7lfRouJkR
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR02MB3857
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2022-02-16 08:46, Patrick Rudolph wrote:
> 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 | 34 ++++++++++++++++++++++++-----
>  1 file changed, 29 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> index 33b9a6a1fffa..e25383752616 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>
> @@ -119,6 +120,7 @@ struct pca954x {
>  	struct irq_domain *irq;
>  	unsigned int irq_mask;
>  	raw_spinlock_t lock;
> +	struct regulator *supply;
>  };
>  
>  /* Provide specs for the PCA954x and MAX735x types we know about */
> @@ -459,6 +461,9 @@ static void pca954x_cleanup(struct i2c_mux_core *muxc)
>  	struct pca954x *data = i2c_mux_priv(muxc);
>  	int c, irq;
>  
> +	if (!IS_ERR_OR_NULL(data->supply))
> +		regulator_disable(data->supply);
> +
>  	if (data->irq) {
>  		for (c = 0; c < data->chip->nchans; c++) {
>  			irq = irq_find_mapping(data->irq, c);
> @@ -513,15 +518,32 @@ static int pca954x_probe(struct i2c_client *client,
>  			     pca954x_select_chan, pca954x_deselect_mux);
>  	if (!muxc)
>  		return -ENOMEM;
> +
>  	data = i2c_mux_priv(muxc);
>  
>  	i2c_set_clientdata(client, muxc);
>  	data->client = client;
>  
> +	data->supply = devm_regulator_get(dev, "vdd");
> +	if (IS_ERR(data->supply)) {
> +		ret = PTR_ERR(data->supply);
> +		if (ret != -EPROBE_DEFER)
> +			dev_err(dev, "Failed to request regulator: %d\n", ret);
> +		return ret;
> +	}
> +

I think you need enclose the below in "if (data->supply)"

Cheers,
Peter

> +	ret = regulator_enable(data->supply);
> +	if (ret) {
> +		dev_err(dev, "Failed to enable regulator: %d\n", ret);
> +		return ret;
> +	}
> +
>  	/* 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);
> @@ -538,7 +560,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 ||
> @@ -546,7 +568,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;
>  		}
>  	}
>  
> @@ -565,7 +588,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);