gpio: pcf857x: Extend match data support for OF tables

Message ID	20230819180443.16718-1-biju.das.jz@bp.renesas.com
State	Accepted
Commit	db3b16dcc7e4f5bfbe35806a54fb15dc858d19f8
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> From: Biju Das <biju.das.jz@bp.renesas.com> To: Linus Walleij <linus.walleij@linaro.org>, Bartosz Golaszewski <brgl@bgdev.pl> Cc: Biju Das <biju.das.jz@bp.renesas.com>, Andy Shevchenko <andy@kernel.org>, linux-gpio@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>, linux-renesas-soc@vger.kernel.org Subject: [PATCH] gpio: pcf857x: Extend match data support for OF tables Date: Sat, 19 Aug 2023 19:04:43 +0100 Message-Id: <20230819180443.16718-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	gpio: pcf857x: Extend match data support for OF tables \| expand gpio: pcf857x: Extend match data support for OF tables

Message ID

20230819180443.16718-1-biju.das.jz@bp.renesas.com

State

Accepted

Commit

db3b16dcc7e4f5bfbe35806a54fb15dc858d19f8

Headers

From: Biju Das <biju.das.jz@bp.renesas.com>
To: Linus Walleij <linus.walleij@linaro.org>,
        Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
        Andy Shevchenko <andy@kernel.org>, linux-gpio@vger.kernel.org,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>,
        linux-renesas-soc@vger.kernel.org
Subject: [PATCH] gpio: pcf857x: Extend match data support for OF tables
Date: Sat, 19 Aug 2023 19:04:43 +0100
Message-Id: <20230819180443.16718-1-biju.das.jz@bp.renesas.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

gpio: pcf857x: Extend match data support for OF tables | expand

Commit Message

Biju Das Aug. 19, 2023, 6:04 p.m. UTC

The driver has OF match table, but still it uses an ID lookup table for
retrieving match data. Currently, the driver is working on the
assumption that an I2C device registered via OF will always match a
legacy I2C device ID. Extend match data support for OF tables by using
i2c_get_match_data() instead of the ID lookup for both OF/ID matches by
making similar OF/ID tables.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
Note:
 This patch is only compile tested.
---
 drivers/gpio/gpio-pcf857x.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Comments

Andy Shevchenko Aug. 21, 2023, 1:09 p.m. UTC | #1

On Sat, Aug 19, 2023 at 07:04:43PM +0100, Biju Das wrote:
> The driver has OF match table, but still it uses an ID lookup table for
> retrieving match data. Currently, the driver is working on the
> assumption that an I2C device registered via OF will always match a
> legacy I2C device ID. Extend match data support for OF tables by using
> i2c_get_match_data() instead of the ID lookup for both OF/ID matches by
> making similar OF/ID tables.

OK.
Reviewed-by: Andy Shevchenko <andy@kernel.org>

Bartosz Golaszewski Aug. 22, 2023, 9:41 a.m. UTC | #2

On Sat, Aug 19, 2023 at 8:04 PM Biju Das <biju.das.jz@bp.renesas.com> wrote:
>
> The driver has OF match table, but still it uses an ID lookup table for
> retrieving match data. Currently, the driver is working on the
> assumption that an I2C device registered via OF will always match a
> legacy I2C device ID. Extend match data support for OF tables by using
> i2c_get_match_data() instead of the ID lookup for both OF/ID matches by
> making similar OF/ID tables.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---

Applied, thanks!

Bart

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index c4c785548408..53b69abe6787 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -36,19 +36,19 @@  static const struct i2c_device_id pcf857x_id[] = {
 MODULE_DEVICE_TABLE(i2c, pcf857x_id);
 
 static const struct of_device_id pcf857x_of_table[] = {
-	{ .compatible = "nxp,pcf8574" },
-	{ .compatible = "nxp,pcf8574a" },
-	{ .compatible = "nxp,pca8574" },
-	{ .compatible = "nxp,pca9670" },
-	{ .compatible = "nxp,pca9672" },
-	{ .compatible = "nxp,pca9674" },
-	{ .compatible = "nxp,pcf8575" },
-	{ .compatible = "nxp,pca8575" },
-	{ .compatible = "nxp,pca9671" },
-	{ .compatible = "nxp,pca9673" },
-	{ .compatible = "nxp,pca9675" },
-	{ .compatible = "maxim,max7328" },
-	{ .compatible = "maxim,max7329" },
+	{ .compatible = "nxp,pcf8574", (void *)8 },
+	{ .compatible = "nxp,pcf8574a", (void *)8 },
+	{ .compatible = "nxp,pca8574", (void *)8 },
+	{ .compatible = "nxp,pca9670", (void *)8 },
+	{ .compatible = "nxp,pca9672", (void *)8 },
+	{ .compatible = "nxp,pca9674", (void *)8 },
+	{ .compatible = "nxp,pcf8575", (void *)16 },
+	{ .compatible = "nxp,pca8575", (void *)16 },
+	{ .compatible = "nxp,pca9671", (void *)16 },
+	{ .compatible = "nxp,pca9673", (void *)16 },
+	{ .compatible = "nxp,pca9675", (void *)16 },
+	{ .compatible = "maxim,max7328", (void *)8 },
+	{ .compatible = "maxim,max7329", (void *)8 },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, pcf857x_of_table);
@@ -272,7 +272,6 @@  static const struct irq_chip pcf857x_irq_chip = {
 
 static int pcf857x_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct pcf857x *gpio;
 	unsigned int n_latch = 0;
 	int status;
@@ -296,7 +295,7 @@  static int pcf857x_probe(struct i2c_client *client)
 	gpio->chip.set_multiple		= pcf857x_set_multiple;
 	gpio->chip.direction_input	= pcf857x_input;
 	gpio->chip.direction_output	= pcf857x_output;
-	gpio->chip.ngpio		= id->driver_data;
+	gpio->chip.ngpio		= (uintptr_t)i2c_get_match_data(client);
 
 	/* NOTE:  the OnSemi jlc1562b is also largely compatible with
 	 * these parts, notably for output.  It has a low-resolution

gpio: pcf857x: Extend match data support for OF tables

Commit Message

Comments

Patch