From patchwork Fri Mar 8 10:34:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhargav Raviprakash X-Patchwork-Id: 13586638 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0306EC5475B for ; Fri, 8 Mar 2024 10:35:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RiH4OdT4nEJ3l4VhUNvEjAYGTzicz9q4J+gdoJd4nZ0=; b=x981qe347TUTCo EMxFQFCxqCakWAGhgwbSQAGqODDx6Qy6kbbu9XtHDFLXojYpp5GDX0A14DYHxvfD5xsLapScYuZiJ IcDWwilbzfaoegGIie31LRMlbPxa5FAG/vpAdCt2fXwXgUugC2ANZdFISXWdJe6a5lsV0DX3PZEB4 f2WsXfSonMlcNlzIWAuEJSSAmK+NUF+QOUv/E39lJJucTEyMNe9R0dHpiiii2o7nedQ285/kYQxrZ 6z7t85lVxV2wf2gIaDIILBy0P0nC/kwRwa+IrkEwwmjk/4nFl+VbLBdyGZUJ3kK8mNCPpEYzX7CXF 1nvO1uKNGi4esSRPzyzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1riXZm-00000008muw-2z2z; Fri, 08 Mar 2024 10:35:43 +0000 Received: from [14.140.155.42] (helo=esa2.ltts.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1riXZd-00000008ml3-3cHt for linux-arm-kernel@lists.infradead.org; Fri, 08 Mar 2024 10:35:35 +0000 IronPort-SDR: B+CKXQN/PRp47eMbnbiDS9dZTePSyLAvv9rTUftMXaJMYF0wByZCB0EIHGhw3D12KRQcgv4N4V IW3sRhZW+hzw== Received: from unknown (HELO localhost.localdomain) ([192.168.34.55]) by esa2.ltts.com with ESMTP; 08 Mar 2024 16:05:08 +0530 From: Bhargav Raviprakash To: linux-kernel@vger.kernel.org Cc: m.nirmaladevi@ltts.com, lee@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jpanis@baylibre.com, devicetree@vger.kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, lgirdwood@gmail.com, broonie@kernel.org, linus.walleij@linaro.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, nm@ti.com, vigneshr@ti.com, kristo@kernel.org, eblanc@baylibre.com, Bhargav Raviprakash Subject: [PATCH v3 03/11] mfd: tps6594: add regmap config in match data Date: Fri, 8 Mar 2024 16:04:47 +0530 Message-Id: <20240308103455.242705-4-bhargav.r@ltts.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240308103455.242705-1-bhargav.r@ltts.com> References: <20240308103455.242705-1-bhargav.r@ltts.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240308_023534_481297_985D3291 X-CRM114-Status: GOOD ( 13.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduces a new struct tps6594_match_data. This struct holds fields for chip id and regmap config. Using this struct in of_device_id data field. This helps in adding support for TPS65224 PMIC. Signed-off-by: Bhargav Raviprakash Acked-by: Julien Panis --- drivers/mfd/tps6594-i2c.c | 24 ++++++++++++++++-------- drivers/mfd/tps6594-spi.c | 24 ++++++++++++++++-------- include/linux/mfd/tps6594.h | 11 +++++++++++ 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c index c125b474b..e80e0af2b 100644 --- a/drivers/mfd/tps6594-i2c.c +++ b/drivers/mfd/tps6594-i2c.c @@ -192,10 +192,16 @@ static const struct regmap_config tps6594_i2c_regmap_config = { .write = tps6594_i2c_write, }; +static const struct tps6594_match_data match_data[] = { + [TPS6594] = {TPS6594, &tps6594_i2c_regmap_config}, + [TPS6593] = {TPS6593, &tps6594_i2c_regmap_config}, + [LP8764] = {LP8764, &tps6594_i2c_regmap_config}, +}; + static const struct of_device_id tps6594_i2c_of_match_table[] = { - { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594, }, - { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, }, - { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, }, + { .compatible = "ti,tps6594-q1", .data = (void *)&match_data[TPS6594], }, + { .compatible = "ti,tps6593-q1", .data = (void *)&match_data[TPS6593], }, + { .compatible = "ti,lp8764-q1", .data = (void *)&match_data[LP8764], }, {} }; MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table); @@ -205,6 +211,7 @@ static int tps6594_i2c_probe(struct i2c_client *client) struct device *dev = &client->dev; struct tps6594 *tps; const struct of_device_id *match; + const struct tps6594_match_data *mdata; tps = devm_kzalloc(dev, sizeof(*tps), GFP_KERNEL); if (!tps) @@ -216,14 +223,15 @@ static int tps6594_i2c_probe(struct i2c_client *client) tps->reg = client->addr; tps->irq = client->irq; - tps->regmap = devm_regmap_init(dev, NULL, client, &tps6594_i2c_regmap_config); - if (IS_ERR(tps->regmap)) - return dev_err_probe(dev, PTR_ERR(tps->regmap), "Failed to init regmap\n"); - match = of_match_device(tps6594_i2c_of_match_table, dev); if (!match) return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n"); - tps->chip_id = (unsigned long)match->data; + mdata = (struct tps6594_match_data *)match->data; + tps->chip_id = mdata->chip_id; + + tps->regmap = devm_regmap_init(dev, NULL, client, mdata->config); + if (IS_ERR(tps->regmap)) + return dev_err_probe(dev, PTR_ERR(tps->regmap), "Failed to init regmap\n"); crc8_populate_msb(tps6594_i2c_crc_table, TPS6594_CRC8_POLYNOMIAL); diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c index 5afb1736f..b9428dc12 100644 --- a/drivers/mfd/tps6594-spi.c +++ b/drivers/mfd/tps6594-spi.c @@ -77,10 +77,16 @@ static const struct regmap_config tps6594_spi_regmap_config = { .use_single_write = true, }; +static const struct tps6594_match_data match_data[] = { + [TPS6594] = {TPS6594, &tps6594_spi_regmap_config}, + [TPS6593] = {TPS6593, &tps6594_spi_regmap_config}, + [LP8764] = {LP8764, &tps6594_spi_regmap_config}, +}; + static const struct of_device_id tps6594_spi_of_match_table[] = { - { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594, }, - { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, }, - { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, }, + { .compatible = "ti,tps6594-q1", .data = (void *)&match_data[TPS6594], }, + { .compatible = "ti,tps6593-q1", .data = (void *)&match_data[TPS6593], }, + { .compatible = "ti,lp8764-q1", .data = (void *)&match_data[LP8764], }, {} }; MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table); @@ -90,6 +96,7 @@ static int tps6594_spi_probe(struct spi_device *spi) struct device *dev = &spi->dev; struct tps6594 *tps; const struct of_device_id *match; + const struct tps6594_match_data *mdata; tps = devm_kzalloc(dev, sizeof(*tps), GFP_KERNEL); if (!tps) @@ -101,14 +108,15 @@ static int tps6594_spi_probe(struct spi_device *spi) tps->reg = spi_get_chipselect(spi, 0); tps->irq = spi->irq; - tps->regmap = devm_regmap_init(dev, NULL, spi, &tps6594_spi_regmap_config); - if (IS_ERR(tps->regmap)) - return dev_err_probe(dev, PTR_ERR(tps->regmap), "Failed to init regmap\n"); - match = of_match_device(tps6594_spi_of_match_table, dev); if (!match) return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n"); - tps->chip_id = (unsigned long)match->data; + mdata = (struct tps6594_match_data *)match->data; + tps->chip_id = mdata->chip_id; + + tps->regmap = devm_regmap_init(dev, NULL, spi, mdata->config); + if (IS_ERR(tps->regmap)) + return dev_err_probe(dev, PTR_ERR(tps->regmap), "Failed to init regmap\n"); crc8_populate_msb(tps6594_spi_crc_table, TPS6594_CRC8_POLYNOMIAL); diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h index 6c5a2889f..615529591 100644 --- a/include/linux/mfd/tps6594.h +++ b/include/linux/mfd/tps6594.h @@ -1344,6 +1344,17 @@ struct tps6594 { struct regmap_irq_chip_data *irq_data; }; +/** + * struct tps6594_match_data - of match data of PMIC + * + * @chip_id: chip ID of PMIC + * @config: regmap config of PMIC + */ +struct tps6594_match_data { + unsigned long chip_id; + const struct regmap_config *config; +}; + extern const struct regmap_access_table tps6594_volatile_table; extern const struct regmap_access_table tps65224_volatile_table;