From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C16B4227586; Tue, 13 May 2025 15:36:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747150571; cv=none; b=UpFRbeAAFeoJLr6qlVy1Jx4agPQoFjnmwO3B1mqW3BHjIclbn3pWAoeBxcc60IYkhJ2Mvxbl1Cby/HpBddpJ+yzb/hrd02NepK6ewSo5ZF3jAaOOMzf1Gv3RtwlJNFInl6Ee9gzjdoNkMY99BXfyZJohHa5gN3FibG1GwOQvl1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747150571; c=relaxed/simple; bh=XDhjP9g95eEB1fOFVjdYU9odDGlFGPRtUGZtVRU7W8w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=jGJw5RIMgiQo+WIIpIjXzLp1mA18hQd627RExWkgoSvozTM43uIlrw4/DLMbmZh6D9LjoUdCU/eeodm0UEtlf6CMNJtPOPFC8nCA8F+hb95ehpy7FwJ6O/TcfcqHYrHU3fBF2cE4gbYMfm6QF7zISkFl1TPslyh/9rj5Hg/DDZs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=u/mKwGCw; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="u/mKwGCw" Received: from pendragon.ideasonboard.com (unknown [146.0.27.149]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0A9A84C9; Tue, 13 May 2025 17:35:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1747150552; bh=XDhjP9g95eEB1fOFVjdYU9odDGlFGPRtUGZtVRU7W8w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=u/mKwGCw4YZun0sa7iGY8rfVc0uF9s5JftpXotc+vDEL1vBwq51laTPK2HW6MerBw ZAIFx1jgA47TWO4DAqtLNOcADnhSbIzk5PP21/FAzHyDpSBXPLiLTV2cpMxonvXxNF i/0/i16gsfT+9sbY0aBBY1uUStx3ud4MAAlo9PUg= Date: Tue, 13 May 2025 17:35:59 +0200 From: Laurent Pinchart To: Lee Jones Cc: nuno.sa@analog.com, linux-gpio@vger.kernel.org, linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-input@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= , Linus Walleij , Bartosz Golaszewski , Dmitry Torokhov , Liu Ying Subject: Re: [PATCH v3 07/22] mfd: adp5585: refactor how regmap defaults are handled Message-ID: <20250513153559.GD23592@pendragon.ideasonboard.com> References: <20250512-dev-adp5589-fw-v3-0-092b14b79a88@analog.com> <20250512-dev-adp5589-fw-v3-7-092b14b79a88@analog.com> <20250513150029.GO2936510@google.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250513150029.GO2936510@google.com> On Tue, May 13, 2025 at 04:00:29PM +0100, Lee Jones wrote: > On Mon, 12 May 2025, Nuno Sá via B4 Relay wrote: > > > From: Nuno Sá > > > > The only thing changing between variants is the regmap default > > registers. Hence, instead of having a regmap condig for every variant > > (duplicating lots of fields), add a chip info type of structure with a > > regmap id to identify which defaults to use and populate regmap_config > > at runtime given a template plus the id. Also note that between > > variants, the defaults can be the same which means the chip info > > structure can be used in more than one compatible. > > > > This will also make it simpler adding new chips with more variants. > > > > Also note that the chip info structures are deliberately not const as > > they will also contain lots of members that are the same between the > > different devices variants and so we will fill those at runtime. > > > > Signed-off-by: Nuno Sá > > --- > > drivers/mfd/adp5585.c | 94 +++++++++++++++++++++++++-------------------- > > include/linux/mfd/adp5585.h | 11 ++++++ > > 2 files changed, 64 insertions(+), 41 deletions(-) > > > > diff --git a/drivers/mfd/adp5585.c b/drivers/mfd/adp5585.c > > index 19d4a0ab1bb4c261e82559630624059529765fbd..874aed7d7cfe052587720d899096c995c19667af 100644 > > --- a/drivers/mfd/adp5585.c > > +++ b/drivers/mfd/adp5585.c > > @@ -81,41 +81,34 @@ static const u8 adp5585_regmap_defaults_04[ADP5585_MAX_REG + 1] = { > > /* 0x38 */ 0x00, 0x00, 0x00, 0x00, 0x00, > > }; > > > > -enum adp5585_regmap_type { > > - ADP5585_REGMAP_00, > > - ADP5585_REGMAP_02, > > - ADP5585_REGMAP_04, > > +static const struct regmap_config adp5585_regmap_config_template = { > > + .reg_bits = 8, > > + .val_bits = 8, > > + .max_register = ADP5585_MAX_REG, > > + .volatile_table = &adp5585_volatile_regs, > > + .cache_type = REGCACHE_MAPLE, > > + .num_reg_defaults_raw = ADP5585_MAX_REG + 1, > > }; > > > > -static const struct regmap_config adp5585_regmap_configs[] = { > > - [ADP5585_REGMAP_00] = { > > - .reg_bits = 8, > > - .val_bits = 8, > > - .max_register = ADP5585_MAX_REG, > > - .volatile_table = &adp5585_volatile_regs, > > - .cache_type = REGCACHE_MAPLE, > > - .reg_defaults_raw = adp5585_regmap_defaults_00, > > - .num_reg_defaults_raw = sizeof(adp5585_regmap_defaults_00), > > - }, > > - [ADP5585_REGMAP_02] = { > > - .reg_bits = 8, > > - .val_bits = 8, > > - .max_register = ADP5585_MAX_REG, > > - .volatile_table = &adp5585_volatile_regs, > > - .cache_type = REGCACHE_MAPLE, > > - .reg_defaults_raw = adp5585_regmap_defaults_02, > > - .num_reg_defaults_raw = sizeof(adp5585_regmap_defaults_02), > > - }, > > - [ADP5585_REGMAP_04] = { > > - .reg_bits = 8, > > - .val_bits = 8, > > - .max_register = ADP5585_MAX_REG, > > - .volatile_table = &adp5585_volatile_regs, > > - .cache_type = REGCACHE_MAPLE, > > - .reg_defaults_raw = adp5585_regmap_defaults_04, > > - .num_reg_defaults_raw = sizeof(adp5585_regmap_defaults_04), > > - }, > > -}; > > +static int adp5585_fill_regmap_config(const struct adp5585_dev *adp5585, > > + struct regmap_config *regmap_config) > > I like the general idea. This is much more scaleable than before. > > > +{ > > + *regmap_config = adp5585_regmap_config_template; > > + > > + switch (adp5585->info->regmap_type) { > > + case ADP5585_REGMAP_00: > > + regmap_config->reg_defaults_raw = adp5585_regmap_defaults_00; > > + return 0; > > + case ADP5585_REGMAP_02: > > + regmap_config->reg_defaults_raw = adp5585_regmap_defaults_02; > > + return 0; > > + case ADP5585_REGMAP_04: > > + regmap_config->reg_defaults_raw = adp5585_regmap_defaults_04; > > You could make this read a tiny bit nicer (as you do with the adp5585->info > in a later patch) and make reg_defaults_raw a local variable. And as ADP585_REGMAP_* is an enum and we have to handle all values, you can replace the switch with a static const array lookup. > > + return 0; > > + default: > > + return -ENODEV; > > + } > > +} > > > > static int adp5585_parse_fw(struct device *dev, struct adp5585_dev *adp5585, > > struct mfd_cell **devs) > > @@ -153,7 +146,7 @@ static void adp5585_osc_disable(void *data) > > > > static int adp5585_i2c_probe(struct i2c_client *i2c) > > { > > - const struct regmap_config *regmap_config; > > + struct regmap_config regmap_config; > > struct adp5585_dev *adp5585; > > struct mfd_cell *devs; > > unsigned int id; > > @@ -165,8 +158,15 @@ static int adp5585_i2c_probe(struct i2c_client *i2c) > > > > i2c_set_clientdata(i2c, adp5585); > > > > - regmap_config = i2c_get_match_data(i2c); > > - adp5585->regmap = devm_regmap_init_i2c(i2c, regmap_config); > > + adp5585->info = i2c_get_match_data(i2c); > > + if (!adp5585->info) > > + return -ENODEV; > > + > > + ret = adp5585_fill_regmap_config(adp5585, ®map_config); > > + if (ret) > > + return ret; > > + > > + adp5585->regmap = devm_regmap_init_i2c(i2c, ®map_config); > > if (IS_ERR(adp5585->regmap)) > > return dev_err_probe(&i2c->dev, PTR_ERR(adp5585->regmap), > > "Failed to initialize register map\n"); > > @@ -223,22 +223,34 @@ static int adp5585_resume(struct device *dev) > > > > static DEFINE_SIMPLE_DEV_PM_OPS(adp5585_pm, adp5585_suspend, adp5585_resume); > > > > +static struct adp5585_info adp5585_info = { > > + .regmap_type = ADP5585_REGMAP_00, > > Instead of providing this enum, then later another one (id) which is a > subset of the same thing, why not pass just ADP5585_REGMAP_00, etc > through the DT .data attribute then match on those? It will add a > couple of lines to the switch(info->id) statement, but will save on a > boat load of static structs and other complexity. > > For instance: > > switch (info->id) { > case ADP5585_MAN_ID_VALUE: > > Would simply become: > > switch (info->id) { > case ADP5585_REGMAP_00: > case ADP5585_REGMAP_02: > case ADP5585_REGMAP_04: > > And that's it. > > > +}; > > + > > +static struct adp5585_info adp5585_02_info = { > > + .regmap_type = ADP5585_REGMAP_02, > > +}; > > + > > +static struct adp5585_info adp5585_04_info = { > > + .regmap_type = ADP5585_REGMAP_04, > > +}; > > + > > static const struct of_device_id adp5585_of_match[] = { > > { > > .compatible = "adi,adp5585-00", > > - .data = &adp5585_regmap_configs[ADP5585_REGMAP_00], > > + .data = &adp5585_info, > > .data = ADP5585_REGMAP_00, > > > }, { > > .compatible = "adi,adp5585-01", > > - .data = &adp5585_regmap_configs[ADP5585_REGMAP_00], > > + .data = &adp5585_info, > > }, { > > .compatible = "adi,adp5585-02", > > - .data = &adp5585_regmap_configs[ADP5585_REGMAP_02], > > + .data = &adp5585_02_info, > > }, { > > .compatible = "adi,adp5585-03", > > - .data = &adp5585_regmap_configs[ADP5585_REGMAP_00], > > + .data = &adp5585_info, > > }, { > > .compatible = "adi,adp5585-04", > > - .data = &adp5585_regmap_configs[ADP5585_REGMAP_04], > > + .data = &adp5585_04_info, > > }, > > { /* sentinel */ } > > }; > > diff --git a/include/linux/mfd/adp5585.h b/include/linux/mfd/adp5585.h > > index 016033cd68e46757aca86d21dd37025fd354b801..4b48614970a811a8a95116faa20e58ea4f19ede6 100644 > > --- a/include/linux/mfd/adp5585.h > > +++ b/include/linux/mfd/adp5585.h > > @@ -119,8 +119,19 @@ > > > > struct regmap; > > > > +enum adp5585_regmap_type { > > + ADP5585_REGMAP_00, > > + ADP5585_REGMAP_02, > > + ADP5585_REGMAP_04, > > +}; > > + > > +struct adp5585_info { > > + enum adp5585_regmap_type regmap_type; > > +}; > > + > > struct adp5585_dev { > > struct regmap *regmap; > > + const struct adp5585_info *info; > > }; > > > > #endif -- Regards, Laurent Pinchart