[PATCH v3 0/4] gpio: timberdale: remove platform data header

[PATCH v3 0/4] gpio: timberdale: remove platform data header

[Bartosz Golaszewski]

There are several GPIO driver header scattered directly under
include/linux/. I'd like to either remove them or move then under
include/linux/gpio/. In case of gpio-timberdale, the platform data
struct can be replaced with generic device properties. This series does
that. It can go either though the MFD tree or GPIO with an Ack from Lee.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
Changes in v3:
- Replace magic values with named defines
- Move GPIO_NR_PINS into the MFD driver
- Explain the advantage of using device properties over platform data
- Link to v2: https://patch.msgid.link/20260316-gpio-timberdale-swnode-v2-0-ea0078066871@oss.qualcomm.com

Changes in v2:
- Change the property names to make them consistent with existing ones
  used by intel
- Link to v1: https://patch.msgid.link/20260313-gpio-timberdale-swnode-v1-0-4df2e9b1dab5@oss.qualcomm.com

---
Bartosz Golaszewski (4):
      mfd: timberdale: move GPIO_NR_PINS into the driver
      mfd: timberdale: set up a software node for the GPIO cell
      gpio: timberdale: use device properties
      gpio: timberdale: remove platform data header

 drivers/gpio/gpio-timberdale.c | 26 +++++++++++++-------------
 drivers/mfd/timberdale.c       | 33 ++++++++++++++++++---------------
 drivers/mfd/timberdale.h       |  1 -
 include/linux/timb_gpio.h      | 25 -------------------------
 4 files changed, 31 insertions(+), 54 deletions(-)
---
base-commit: e77a5a5cfe43b4c25bd44a3818e487033287517f
change-id: 20260313-gpio-timberdale-swnode-03b1a0945359

Best regards,
-- 
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>

[PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Bartosz Golaszewski]

This symbol is only used inside the timberdale MFD driver. Move into
the .c file as there's no need for it to be exposed in a header.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
 drivers/mfd/timberdale.c | 2 ++
 drivers/mfd/timberdale.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index a4d9c070d481a182890a58e4b8c850c4c29f7f17..d79419215cc292b705031a6432e877b94f9a1805 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -37,6 +37,8 @@
 
 #define DRIVER_NAME "timberdale"
 
+#define GPIO_NR_PINS	16
+
 struct timberdale_device {
 	resource_size_t		ctl_mapbase;
 	unsigned char __iomem   *ctl_membase;
diff --git a/drivers/mfd/timberdale.h b/drivers/mfd/timberdale.h
index b01d2388e1afe59e14f77e10678bdbe599d2b90f..db7b434f766d03deb7c45ec1c8c5ded003aad087 100644
--- a/drivers/mfd/timberdale.h
+++ b/drivers/mfd/timberdale.h
@@ -113,7 +113,6 @@
 #define GPIO_PIN_ASCB		8
 #define GPIO_PIN_INIC_RST	14
 #define GPIO_PIN_BT_RST		15
-#define GPIO_NR_PINS		16
 
 /* DMA Channels */
 #define DMA_UART_RX         0

-- 
2.47.3

[PATCH v3 2/4] mfd: timberdale: set up a software node for the GPIO cell

[Bartosz Golaszewski]

Using generic device properties instead of custom platform data
structures is preferred due to the resulting unification of the way
properties are accessed in consumer drivers. There's no DT node for the
GPIO cell in this driver but we can create a software node with device
properties and attach it to all the GPIO cells.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
 drivers/mfd/timberdale.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index d79419215cc292b705031a6432e877b94f9a1805..0ab3da3d6818e2108694dcf73f32184a167b701a 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -38,6 +38,8 @@
 #define DRIVER_NAME "timberdale"
 
 #define GPIO_NR_PINS	16
+#define GPIO_BASE	0
+#define IRQ_BASE	200
 
 struct timberdale_device {
 	resource_size_t		ctl_mapbase;
@@ -183,6 +185,18 @@ static struct timbgpio_platform_data
 	.irq_base = 200,
 };
 
+static const struct property_entry timberdale_gpio_properties[] = {
+	PROPERTY_ENTRY_U32("ngpios", GPIO_NR_PINS),
+	PROPERTY_ENTRY_U32("gpio-base", GPIO_BASE),
+	PROPERTY_ENTRY_U32("irq-base", IRQ_BASE),
+	{ }
+};
+
+static const struct software_node timberdale_gpio_swnode = {
+	.name = "timb-gpio",
+	.properties = timberdale_gpio_properties,
+};
+
 static const struct resource timberdale_gpio_resources[] = {
 	{
 		.start	= GPIOOFFSET,
@@ -394,6 +408,7 @@ static const struct mfd_cell timberdale_cells_bar0_cfg0[] = {
 		.resources = timberdale_gpio_resources,
 		.platform_data = &timberdale_gpio_platform_data,
 		.pdata_size = sizeof(timberdale_gpio_platform_data),
+		.swnode = &timberdale_gpio_swnode,
 	},
 	{
 		.name = "timb-video",
@@ -456,6 +471,7 @@ static const struct mfd_cell timberdale_cells_bar0_cfg1[] = {
 		.resources = timberdale_gpio_resources,
 		.platform_data = &timberdale_gpio_platform_data,
 		.pdata_size = sizeof(timberdale_gpio_platform_data),
+		.swnode = &timberdale_gpio_swnode,
 	},
 	{
 		.name = "timb-mlogicore",
@@ -518,6 +534,7 @@ static const struct mfd_cell timberdale_cells_bar0_cfg2[] = {
 		.resources = timberdale_gpio_resources,
 		.platform_data = &timberdale_gpio_platform_data,
 		.pdata_size = sizeof(timberdale_gpio_platform_data),
+		.swnode = &timberdale_gpio_swnode,
 	},
 	{
 		.name = "timb-video",
@@ -568,6 +585,7 @@ static const struct mfd_cell timberdale_cells_bar0_cfg3[] = {
 		.resources = timberdale_gpio_resources,
 		.platform_data = &timberdale_gpio_platform_data,
 		.pdata_size = sizeof(timberdale_gpio_platform_data),
+		.swnode = &timberdale_gpio_swnode,
 	},
 	{
 		.name = "timb-video",

-- 
2.47.3

[PATCH v3 3/4] gpio: timberdale: use device properties

[Bartosz Golaszewski]

The top-level MFD driver now passes the device properties to the GPIO
cell via the software node. Use generic device property accessors and
stop using platform data. We can ignore the "ngpios" property here now
as it will be retrieved internally by GPIO core.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
 drivers/gpio/gpio-timberdale.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index f488939dd00a8a7f332d3af27962a38a3b7e6ecf..78fe133f5d32350567c28a1cc982d7bb3183ff2b 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -14,7 +14,6 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/timb_gpio.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 
@@ -225,19 +224,21 @@ static int timbgpio_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct gpio_chip *gc;
 	struct timbgpio *tgpio;
-	struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	int irq = platform_get_irq(pdev, 0);
 
-	if (!pdata || pdata->nr_pins > 32) {
-		dev_err(dev, "Invalid platform data\n");
-		return -EINVAL;
-	}
-
 	tgpio = devm_kzalloc(dev, sizeof(*tgpio), GFP_KERNEL);
 	if (!tgpio)
 		return -EINVAL;
 
-	tgpio->irq_base = pdata->irq_base;
+	gc = &tgpio->gpio;
+
+	err = device_property_read_u32(dev, "irq-base", &tgpio->irq_base);
+	if (err)
+		return err;
+
+	err = device_property_read_u32(dev, "gpio-base", &gc->base);
+	if (err)
+		return err;
 
 	spin_lock_init(&tgpio->lock);
 
@@ -245,8 +246,6 @@ static int timbgpio_probe(struct platform_device *pdev)
 	if (IS_ERR(tgpio->membase))
 		return PTR_ERR(tgpio->membase);
 
-	gc = &tgpio->gpio;
-
 	gc->label = dev_name(&pdev->dev);
 	gc->owner = THIS_MODULE;
 	gc->parent = &pdev->dev;
@@ -256,21 +255,22 @@ static int timbgpio_probe(struct platform_device *pdev)
 	gc->set = timbgpio_gpio_set;
 	gc->to_irq = (irq >= 0 && tgpio->irq_base > 0) ? timbgpio_to_irq : NULL;
 	gc->dbg_show = NULL;
-	gc->base = pdata->gpio_base;
-	gc->ngpio = pdata->nr_pins;
 	gc->can_sleep = false;
 
 	err = devm_gpiochip_add_data(&pdev->dev, gc, tgpio);
 	if (err)
 		return err;
 
+	if (gc->ngpio > 32)
+		return dev_err_probe(dev, -EINVAL, "Invalid number of pins\n");
+
 	/* make sure to disable interrupts */
 	iowrite32(0x0, tgpio->membase + TGPIO_IER);
 
 	if (irq < 0 || tgpio->irq_base <= 0)
 		return 0;
 
-	for (i = 0; i < pdata->nr_pins; i++) {
+	for (i = 0; i < gc->ngpio; i++) {
 		irq_set_chip_and_handler(tgpio->irq_base + i,
 			&timbgpio_irqchip, handle_simple_irq);
 		irq_set_chip_data(tgpio->irq_base + i, tgpio);

-- 
2.47.3

[PATCH v3 4/4] gpio: timberdale: remove platform data header

[Bartosz Golaszewski]

With no more users, we can remove timb_gpio.h.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
 drivers/mfd/timberdale.c  | 17 -----------------
 include/linux/timb_gpio.h | 25 -------------------------
 2 files changed, 42 deletions(-)

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 0ab3da3d6818e2108694dcf73f32184a167b701a..e75e1d6851abe0d68d7a8089aad561845d4f9339 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -15,8 +15,6 @@
 #include <linux/property.h>
 #include <linux/slab.h>
 
-#include <linux/timb_gpio.h>
-
 #include <linux/i2c.h>
 #include <linux/platform_data/i2c-ocores.h>
 #include <linux/platform_data/i2c-xiic.h>
@@ -178,13 +176,6 @@ static const struct resource timberdale_eth_resources[] = {
 	},
 };
 
-static struct timbgpio_platform_data
-	timberdale_gpio_platform_data = {
-	.gpio_base = 0,
-	.nr_pins = GPIO_NR_PINS,
-	.irq_base = 200,
-};
-
 static const struct property_entry timberdale_gpio_properties[] = {
 	PROPERTY_ENTRY_U32("ngpios", GPIO_NR_PINS),
 	PROPERTY_ENTRY_U32("gpio-base", GPIO_BASE),
@@ -406,8 +397,6 @@ static const struct mfd_cell timberdale_cells_bar0_cfg0[] = {
 		.name = "timb-gpio",
 		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
 		.resources = timberdale_gpio_resources,
-		.platform_data = &timberdale_gpio_platform_data,
-		.pdata_size = sizeof(timberdale_gpio_platform_data),
 		.swnode = &timberdale_gpio_swnode,
 	},
 	{
@@ -469,8 +458,6 @@ static const struct mfd_cell timberdale_cells_bar0_cfg1[] = {
 		.name = "timb-gpio",
 		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
 		.resources = timberdale_gpio_resources,
-		.platform_data = &timberdale_gpio_platform_data,
-		.pdata_size = sizeof(timberdale_gpio_platform_data),
 		.swnode = &timberdale_gpio_swnode,
 	},
 	{
@@ -532,8 +519,6 @@ static const struct mfd_cell timberdale_cells_bar0_cfg2[] = {
 		.name = "timb-gpio",
 		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
 		.resources = timberdale_gpio_resources,
-		.platform_data = &timberdale_gpio_platform_data,
-		.pdata_size = sizeof(timberdale_gpio_platform_data),
 		.swnode = &timberdale_gpio_swnode,
 	},
 	{
@@ -583,8 +568,6 @@ static const struct mfd_cell timberdale_cells_bar0_cfg3[] = {
 		.name = "timb-gpio",
 		.num_resources = ARRAY_SIZE(timberdale_gpio_resources),
 		.resources = timberdale_gpio_resources,
-		.platform_data = &timberdale_gpio_platform_data,
-		.pdata_size = sizeof(timberdale_gpio_platform_data),
 		.swnode = &timberdale_gpio_swnode,
 	},
 	{
diff --git a/include/linux/timb_gpio.h b/include/linux/timb_gpio.h
deleted file mode 100644
index 74f5e73bf6db67170817352415ca58b415870886..0000000000000000000000000000000000000000
--- a/include/linux/timb_gpio.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * timb_gpio.h timberdale FPGA GPIO driver, platform data definition
- * Copyright (c) 2009 Intel Corporation
- */
-
-#ifndef _LINUX_TIMB_GPIO_H
-#define _LINUX_TIMB_GPIO_H
-
-/**
- * struct timbgpio_platform_data - Platform data of the Timberdale GPIO driver
- * @gpio_base:		The number of the first GPIO pin, set to -1 for
- *			dynamic number allocation.
- * @nr_pins:		Number of pins that is supported by the hardware (1-32)
- * @irq_base:		If IRQ is supported by the hardware, this is the base
- *			number of IRQ:s. One IRQ per pin will be used. Set to
- *			-1 if IRQ:s is not supported.
- */
-struct timbgpio_platform_data {
-	int gpio_base;
-	int nr_pins;
-	int irq_base;
-};
-
-#endif

-- 
2.47.3

Re: [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Andy Shevchenko]

On Fri, Mar 27, 2026 at 11:49:07AM +0100, Bartosz Golaszewski wrote:
> This symbol is only used inside the timberdale MFD driver. Move into
> the .c file as there's no need for it to be exposed in a header.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Lee Jones]

On Fri, 27 Mar 2026, Bartosz Golaszewski wrote:

> This symbol is only used inside the timberdale MFD driver. Move into
> the .c file as there's no need for it to be exposed in a header.

I'd prefer that these were all kept together, even if we are over-sharing.

> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> ---
>  drivers/mfd/timberdale.c | 2 ++
>  drivers/mfd/timberdale.h | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
> index a4d9c070d481a182890a58e4b8c850c4c29f7f17..d79419215cc292b705031a6432e877b94f9a1805 100644
> --- a/drivers/mfd/timberdale.c
> +++ b/drivers/mfd/timberdale.c
> @@ -37,6 +37,8 @@
>  
>  #define DRIVER_NAME "timberdale"
>  
> +#define GPIO_NR_PINS	16
> +
>  struct timberdale_device {
>  	resource_size_t		ctl_mapbase;
>  	unsigned char __iomem   *ctl_membase;
> diff --git a/drivers/mfd/timberdale.h b/drivers/mfd/timberdale.h
> index b01d2388e1afe59e14f77e10678bdbe599d2b90f..db7b434f766d03deb7c45ec1c8c5ded003aad087 100644
> --- a/drivers/mfd/timberdale.h
> +++ b/drivers/mfd/timberdale.h
> @@ -113,7 +113,6 @@
>  #define GPIO_PIN_ASCB		8
>  #define GPIO_PIN_INIC_RST	14
>  #define GPIO_PIN_BT_RST		15
> -#define GPIO_NR_PINS		16
>  
>  /* DMA Channels */
>  #define DMA_UART_RX         0
> 
> -- 
> 2.47.3
> 

-- 
Lee Jones [李琼斯]

Re: (subset) [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Lee Jones]

On Fri, 27 Mar 2026 11:49:07 +0100, Bartosz Golaszewski wrote:
> This symbol is only used inside the timberdale MFD driver. Move into
> the .c file as there's no need for it to be exposed in a header.

Applied, thanks!

[1/4] mfd: timberdale: move GPIO_NR_PINS into the driver
      commit: 13f5997f2bbaee976e1a4a6873d6bd40df9b2637

--
Lee Jones [李琼斯]

Re: (subset) [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Lee Jones]

On Thu, 09 Apr 2026, Lee Jones wrote:

> On Fri, 27 Mar 2026 11:49:07 +0100, Bartosz Golaszewski wrote:
> > This symbol is only used inside the timberdale MFD driver. Move into
> > the .c file as there's no need for it to be exposed in a header.
> 
> Applied, thanks!
> 
> [1/4] mfd: timberdale: move GPIO_NR_PINS into the driver
>       commit: 13f5997f2bbaee976e1a4a6873d6bd40df9b2637

Ignore this - I actually plan to take the whole set after -rc1.

-- 
Lee Jones [李琼斯]

Re: [PATCH v3 0/4] gpio: timberdale: remove platform data header

[Lee Jones]

On Fri, 27 Mar 2026, Bartosz Golaszewski wrote:

> There are several GPIO driver header scattered directly under
> include/linux/. I'd like to either remove them or move then under
> include/linux/gpio/. In case of gpio-timberdale, the platform data
> struct can be replaced with generic device properties. This series does
> that. It can go either though the MFD tree or GPIO with an Ack from Lee.
> 
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> ---
> Changes in v3:
> - Replace magic values with named defines
> - Move GPIO_NR_PINS into the MFD driver
> - Explain the advantage of using device properties over platform data
> - Link to v2: https://patch.msgid.link/20260316-gpio-timberdale-swnode-v2-0-ea0078066871@oss.qualcomm.com
> 
> Changes in v2:
> - Change the property names to make them consistent with existing ones
>   used by intel
> - Link to v1: https://patch.msgid.link/20260313-gpio-timberdale-swnode-v1-0-4df2e9b1dab5@oss.qualcomm.com

Note to self: take as an IB after -rc1

-- 
Lee Jones [李琼斯]

Re: (subset) [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Bartosz Golaszewski]

On Thu, 9 Apr 2026 15:20:41 +0200, Lee Jones <lee@kernel.org> said:
> On Thu, 09 Apr 2026, Lee Jones wrote:
>
>> On Fri, 27 Mar 2026 11:49:07 +0100, Bartosz Golaszewski wrote:
>> > This symbol is only used inside the timberdale MFD driver. Move into
>> > the .c file as there's no need for it to be exposed in a header.
>>
>> Applied, thanks!
>>
>> [1/4] mfd: timberdale: move GPIO_NR_PINS into the driver
>>       commit: 13f5997f2bbaee976e1a4a6873d6bd40df9b2637
>
> Ignore this - I actually plan to take the whole set after -rc1.
>
> --
> Lee Jones [李琼斯]
>

Should I resend it rebased on top of v7.1-rc1 once it's out?

Bart

Re: (subset) [PATCH v3 1/4] mfd: timberdale: move GPIO_NR_PINS into the driver

[Lee Jones]

On Thu, 09 Apr 2026, Bartosz Golaszewski wrote:

> On Thu, 9 Apr 2026 15:20:41 +0200, Lee Jones <lee@kernel.org> said:
> > On Thu, 09 Apr 2026, Lee Jones wrote:
> >
> >> On Fri, 27 Mar 2026 11:49:07 +0100, Bartosz Golaszewski wrote:
> >> > This symbol is only used inside the timberdale MFD driver. Move into
> >> > the .c file as there's no need for it to be exposed in a header.
> >>
> >> Applied, thanks!
> >>
> >> [1/4] mfd: timberdale: move GPIO_NR_PINS into the driver
> >>       commit: 13f5997f2bbaee976e1a4a6873d6bd40df9b2637
> >
> > Ignore this - I actually plan to take the whole set after -rc1.
> >
> > --
> > Lee Jones [李琼斯]
> >
> 
> Should I resend it rebased on top of v7.1-rc1 once it's out?

If it doesn't apply cleanly, you will.

-- 
Lee Jones [李琼斯]