From nobody Wed Sep 17 22:39:31 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 471F2C4332F for ; Thu, 15 Dec 2022 15:18:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230053AbiLOPSi (ORCPT ); Thu, 15 Dec 2022 10:18:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbiLOPSP (ORCPT ); Thu, 15 Dec 2022 10:18:15 -0500 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE28919F; Thu, 15 Dec 2022 07:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=O2eT0UvgGEQnr0ncJDYohPICi1eRFPTbSDswL/HyXgA=; b=TPHPiwu8YYuQMCzrLvN0U40GOM EWEBQxHmI+erGzWQzgQYWaefE+ARnWiCBFwRy2DqgJLSyWXKIPmMyelz28/JW/b5Ubj9ZpkGPeVyP qDj74Gxz5Yau+bJG2sTCRfywe+Vy5jt7WE0tX8VsGysEsCnHt6/hWG4L/1hmG2lAlSBI=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:48102 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1p5pm8-0000EC-JF; Thu, 15 Dec 2022 10:03:57 -0500 From: Hugo Villeneuve To: a.zummo@towertech.it, alexandre.belloni@bootlin.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, Hugo Villeneuve Date: Thu, 15 Dec 2022 10:02:02 -0500 Message-Id: <20221215150214.1109074-2-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221215150214.1109074-1-hugo@hugovil.com> References: <20221215150214.1109074-1-hugo@hugovil.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 70.80.174.168 X-SA-Exim-Mail-From: hugo@hugovil.com Subject: [PATCH v3 01/14] rtc: pcf2127: add variant-specific configuration structure X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hugo Villeneuve Create variant-specific configuration structures to simplify the implementation of new variants into this driver. It will also avoid to have too many tests for a specific variant, or a list of variants for new devices, inside the code itself. Add configuration options for the support of the NVMEM, bit CD0 in register WD_CTL as well as the maximum number of registers for each variant, instead of hardcoding the variant (PCF2127) inside the i2c_device_id and spi_device_id structures. Also specify a different maximum number of registers (max_register) for the PCF2129. Signed-off-by: Hugo Villeneuve Reviewed-by: Bruno Thomsen --- drivers/rtc/rtc-pcf2127.c | 95 +++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 19 deletions(-) diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c index 87f4fc9df68b..b9a5d47a439f 100644 --- a/drivers/rtc/rtc-pcf2127.c +++ b/drivers/rtc/rtc-pcf2127.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include =20 @@ -101,10 +102,17 @@ PCF2127_BIT_CTRL2_WDTF | \ PCF2127_BIT_CTRL2_TSF2) =20 +struct pcf21xx_config { + int max_register; + unsigned int has_nvmem:1; + unsigned int has_bit_wd_ctl_cd0:1; +}; + struct pcf2127 { struct rtc_device *rtc; struct watchdog_device wdd; struct regmap *regmap; + const struct pcf21xx_config *cfg; time64_t ts; bool ts_valid; bool irq_enabled; @@ -631,8 +639,27 @@ static const struct attribute_group pcf2127_attr_group= =3D { .attrs =3D pcf2127_attrs, }; =20 +enum pcf21xx_type { + PCF2127, + PCF2129, + PCF21XX_LAST_ID +}; + +static struct pcf21xx_config pcf21xx_cfg[] =3D { + [PCF2127] =3D { + .max_register =3D 0x1d, + .has_nvmem =3D 1, + .has_bit_wd_ctl_cd0 =3D 1, + }, + [PCF2129] =3D { + .max_register =3D 0x19, + .has_nvmem =3D 0, + .has_bit_wd_ctl_cd0 =3D 0, + }, +}; + static int pcf2127_probe(struct device *dev, struct regmap *regmap, - int alarm_irq, const char *name, bool is_pcf2127) + int alarm_irq, const char *name, const struct pcf21xx_config *config) { struct pcf2127 *pcf2127; int ret =3D 0; @@ -645,6 +672,7 @@ static int pcf2127_probe(struct device *dev, struct reg= map *regmap, return -ENOMEM; =20 pcf2127->regmap =3D regmap; + pcf2127->cfg =3D config; =20 dev_set_drvdata(dev, pcf2127); =20 @@ -688,7 +716,7 @@ static int pcf2127_probe(struct device *dev, struct reg= map *regmap, set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); } =20 - if (is_pcf2127) { + if (pcf2127->cfg->has_nvmem) { struct nvmem_config nvmem_cfg =3D { .priv =3D pcf2127, .reg_read =3D pcf2127_nvmem_read, @@ -734,7 +762,7 @@ static int pcf2127_probe(struct device *dev, struct reg= map *regmap, PCF2127_BIT_WD_CTL_TF1 | PCF2127_BIT_WD_CTL_TF0, PCF2127_BIT_WD_CTL_CD1 | - (is_pcf2127 ? PCF2127_BIT_WD_CTL_CD0 : 0) | + (pcf2127->cfg->has_bit_wd_ctl_cd0 ? PCF2127_BIT_WD_CTL_CD0 : 0) | PCF2127_BIT_WD_CTL_TF1); if (ret) { dev_err(dev, "%s: watchdog config (wd_ctl) failed\n", __func__); @@ -799,9 +827,9 @@ static int pcf2127_probe(struct device *dev, struct reg= map *regmap, =20 #ifdef CONFIG_OF static const struct of_device_id pcf2127_of_match[] =3D { - { .compatible =3D "nxp,pcf2127" }, - { .compatible =3D "nxp,pcf2129" }, - { .compatible =3D "nxp,pca2129" }, + { .compatible =3D "nxp,pcf2127", .data =3D &pcf21xx_cfg[PCF2127] }, + { .compatible =3D "nxp,pcf2129", .data =3D &pcf21xx_cfg[PCF2129] }, + { .compatible =3D "nxp,pca2129", .data =3D &pcf21xx_cfg[PCF2129] }, {} }; MODULE_DEVICE_TABLE(of, pcf2127_of_match); @@ -886,26 +914,40 @@ static const struct regmap_bus pcf2127_i2c_regmap =3D= { static struct i2c_driver pcf2127_i2c_driver; =20 static const struct i2c_device_id pcf2127_i2c_id[] =3D { - { "pcf2127", 1 }, - { "pcf2129", 0 }, - { "pca2129", 0 }, + { "pcf2127", PCF2127 }, + { "pcf2129", PCF2129 }, + { "pca2129", PCF2129 }, { } }; MODULE_DEVICE_TABLE(i2c, pcf2127_i2c_id); =20 static int pcf2127_i2c_probe(struct i2c_client *client) { - const struct i2c_device_id *id =3D i2c_match_id(pcf2127_i2c_id, client); struct regmap *regmap; - static const struct regmap_config config =3D { + static struct regmap_config config =3D { .reg_bits =3D 8, .val_bits =3D 8, - .max_register =3D 0x1d, }; + const struct pcf21xx_config *variant; =20 if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) return -ENODEV; =20 + if (client->dev.of_node) { + variant =3D of_device_get_match_data(&client->dev); + if (!variant) + return -ENODEV; + } else { + enum pcf21xx_type type =3D + i2c_match_id(pcf2127_i2c_id, client)->driver_data; + + if (type >=3D PCF21XX_LAST_ID) + return -ENODEV; + variant =3D &pcf21xx_cfg[type]; + } + + config.max_register =3D variant->max_register, + regmap =3D devm_regmap_init(&client->dev, &pcf2127_i2c_regmap, &client->dev, &config); if (IS_ERR(regmap)) { @@ -915,7 +957,7 @@ static int pcf2127_i2c_probe(struct i2c_client *client) } =20 return pcf2127_probe(&client->dev, regmap, client->irq, - pcf2127_i2c_driver.driver.name, id->driver_data); + pcf2127_i2c_driver.driver.name, variant); } =20 static struct i2c_driver pcf2127_i2c_driver =3D { @@ -953,17 +995,32 @@ static void pcf2127_i2c_unregister_driver(void) #if IS_ENABLED(CONFIG_SPI_MASTER) =20 static struct spi_driver pcf2127_spi_driver; +static const struct spi_device_id pcf2127_spi_id[]; =20 static int pcf2127_spi_probe(struct spi_device *spi) { - static const struct regmap_config config =3D { + static struct regmap_config config =3D { .reg_bits =3D 8, .val_bits =3D 8, .read_flag_mask =3D 0xa0, .write_flag_mask =3D 0x20, - .max_register =3D 0x1d, }; struct regmap *regmap; + const struct pcf21xx_config *variant; + + if (spi->dev.of_node) { + variant =3D of_device_get_match_data(&spi->dev); + if (!variant) + return -ENODEV; + } else { + enum pcf21xx_type type =3D spi_get_device_id(spi)->driver_data; + + if (type >=3D PCF21XX_LAST_ID) + return -ENODEV; + variant =3D &pcf21xx_cfg[type]; + } + + config.max_register =3D variant->max_register, =20 regmap =3D devm_regmap_init_spi(spi, &config); if (IS_ERR(regmap)) { @@ -974,13 +1031,13 @@ static int pcf2127_spi_probe(struct spi_device *spi) =20 return pcf2127_probe(&spi->dev, regmap, spi->irq, pcf2127_spi_driver.driver.name, - spi_get_device_id(spi)->driver_data); + variant); } =20 static const struct spi_device_id pcf2127_spi_id[] =3D { - { "pcf2127", 1 }, - { "pcf2129", 0 }, - { "pca2129", 0 }, + { "pcf2127", PCF2127 }, + { "pcf2129", PCF2129 }, + { "pca2129", PCF2129 }, { } }; MODULE_DEVICE_TABLE(spi, pcf2127_spi_id); --=20 2.30.2