diff mbox series

[v2,3/4] mfd: intel_quark_i2c_gpio: Convert GPIO to use software nodes

Message ID 20210804160019.77105-3-andriy.shevchenko@linux.intel.com
State Accepted
Commit 36edadf5d336df62288658fcbdbb0fbf14554611
Headers show
Series None | expand

Commit Message

Andy Shevchenko Aug. 4, 2021, 4 p.m. UTC 
The driver can provide a software node group instead of
passing legacy platform data. This will allow to drop
the legacy platform data structures along with unifying
a child device driver to use same interface for all
property providers, i.e. Device Tree, ACPI, and board files.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
---
v2: added tag (Serge)
 drivers/mfd/intel_quark_i2c_gpio.c | 70 ++++++++++++++++--------------
 1 file changed, 37 insertions(+), 33 deletions(-)

Comments

Lee Jones Aug. 5, 2021, 8:02 a.m. UTC | #1 
On Wed, 04 Aug 2021, Andy Shevchenko wrote:

> The driver can provide a software node group instead of

> passing legacy platform data. This will allow to drop

> the legacy platform data structures along with unifying

> a child device driver to use same interface for all

> property providers, i.e. Device Tree, ACPI, and board files.

> 

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

> Tested-by: Serge Semin <fancer.lancer@gmail.com>

> ---

> v2: added tag (Serge)

>  drivers/mfd/intel_quark_i2c_gpio.c | 70 ++++++++++++++++--------------

>  1 file changed, 37 insertions(+), 33 deletions(-)


For my own reference (apply this as-is to your sign-off block):

  Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Linus Walleij Aug. 11, 2021, 12:48 p.m. UTC | #2 
On Wed, Aug 4, 2021 at 6:15 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:

> The driver can provide a software node group instead of

> passing legacy platform data. This will allow to drop

> the legacy platform data structures along with unifying

> a child device driver to use same interface for all

> property providers, i.e. Device Tree, ACPI, and board files.

>

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

> Tested-by: Serge Semin <fancer.lancer@gmail.com>


Reviewed-by: Linus Walleij <linus.walleij@linaro.org>


Yours,
Linus Walleij
Andy Shevchenko Aug. 11, 2021, 1 p.m. UTC | #3 
On Thu, Aug 05, 2021 at 09:02:47AM +0100, Lee Jones wrote:
> On Wed, 04 Aug 2021, Andy Shevchenko wrote:

> 

> > The driver can provide a software node group instead of

> > passing legacy platform data. This will allow to drop

> > the legacy platform data structures along with unifying

> > a child device driver to use same interface for all

> > property providers, i.e. Device Tree, ACPI, and board files.

> > 

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

> > Tested-by: Serge Semin <fancer.lancer@gmail.com>

> > ---

> > v2: added tag (Serge)

> >  drivers/mfd/intel_quark_i2c_gpio.c | 70 ++++++++++++++++--------------

> >  1 file changed, 37 insertions(+), 33 deletions(-)

> 

> For my own reference (apply this as-is to your sign-off block):

> 

>   Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>


Thanks!

Just for your information. I think due to spaces in front of your tag
the `b4` tool can't catch this automatically.

-- 
With Best Regards,
Andy Shevchenko
Lee Jones Aug. 16, 2021, 7:17 a.m. UTC | #4 
On Wed, 11 Aug 2021, Andy Shevchenko wrote:

> On Thu, Aug 05, 2021 at 09:02:47AM +0100, Lee Jones wrote:

> > On Wed, 04 Aug 2021, Andy Shevchenko wrote:

> > 

> > > The driver can provide a software node group instead of

> > > passing legacy platform data. This will allow to drop

> > > the legacy platform data structures along with unifying

> > > a child device driver to use same interface for all

> > > property providers, i.e. Device Tree, ACPI, and board files.

> > > 

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

> > > Tested-by: Serge Semin <fancer.lancer@gmail.com>

> > > ---

> > > v2: added tag (Serge)

> > >  drivers/mfd/intel_quark_i2c_gpio.c | 70 ++++++++++++++++--------------

> > >  1 file changed, 37 insertions(+), 33 deletions(-)

> > 

> > For my own reference (apply this as-is to your sign-off block):

> > 

> >   Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>

> 

> Thanks!

> 

> Just for your information. I think due to spaces in front of your tag

> the `b4` tool can't catch this automatically.


Why would it need to?

This tag is "for my reference", for when I merge it.

Please add it to your sign-off block when you resubmit.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
diff mbox series

Patch

diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index a43993e38b6e..9b9c76bd067b 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -17,7 +17,6 @@ 
 #include <linux/clk-provider.h>
 #include <linux/dmi.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/gpio-dwapb.h>
 #include <linux/property.h>
 
 /* PCI BAR for register base address */
@@ -28,15 +27,6 @@ 
 #define MFD_ACPI_MATCH_GPIO	0ULL
 #define MFD_ACPI_MATCH_I2C	1ULL
 
-/* The base GPIO number under GPIOLIB framework */
-#define INTEL_QUARK_MFD_GPIO_BASE	8
-
-/* The default number of South-Cluster GPIO on Quark. */
-#define INTEL_QUARK_MFD_NGPIO		8
-
-/* The DesignWare GPIO ports on Quark. */
-#define INTEL_QUARK_GPIO_NPORTS	1
-
 #define INTEL_QUARK_IORES_MEM	0
 #define INTEL_QUARK_IORES_IRQ	1
 
@@ -111,12 +101,38 @@  static struct resource intel_quark_gpio_res[] = {
 	[INTEL_QUARK_IORES_MEM] = {
 		.flags = IORESOURCE_MEM,
 	},
+	[INTEL_QUARK_IORES_IRQ] = {
+		.flags = IORESOURCE_IRQ,
+	},
 };
 
 static struct mfd_cell_acpi_match intel_quark_acpi_match_gpio = {
 	.adr = MFD_ACPI_MATCH_GPIO,
 };
 
+static const struct software_node intel_quark_gpio_controller_node = {
+	.name = "intel-quark-gpio-controller",
+};
+
+static const struct property_entry intel_quark_gpio_portA_properties[] = {
+	PROPERTY_ENTRY_U32("reg", 0),
+	PROPERTY_ENTRY_U32("snps,nr-gpios", 8),
+	PROPERTY_ENTRY_U32("gpio-base", 8),
+	{ }
+};
+
+static const struct software_node intel_quark_gpio_portA_node = {
+	.name = "portA",
+	.parent = &intel_quark_gpio_controller_node,
+	.properties = intel_quark_gpio_portA_properties,
+};
+
+static const struct software_node *intel_quark_gpio_node_group[] = {
+	&intel_quark_gpio_controller_node,
+	&intel_quark_gpio_portA_node,
+	NULL
+};
+
 static struct mfd_cell intel_quark_mfd_cells[] = {
 	[MFD_I2C_BAR] = {
 		.id = MFD_I2C_BAR,
@@ -203,34 +219,19 @@  static int intel_quark_gpio_setup(struct pci_dev *pdev)
 {
 	struct mfd_cell *cell = &intel_quark_mfd_cells[MFD_GPIO_BAR];
 	struct resource *res = intel_quark_gpio_res;
-	struct dwapb_platform_data *pdata;
-	struct device *dev = &pdev->dev;
+	int ret;
 
 	res[INTEL_QUARK_IORES_MEM].start = pci_resource_start(pdev, MFD_GPIO_BAR);
 	res[INTEL_QUARK_IORES_MEM].end = pci_resource_end(pdev, MFD_GPIO_BAR);
 
-	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-	if (!pdata)
-		return -ENOMEM;
-
-	/* For intel quark x1000, it has only one port: portA */
-	pdata->nports = INTEL_QUARK_GPIO_NPORTS;
-	pdata->properties = devm_kcalloc(dev, pdata->nports,
-					 sizeof(*pdata->properties),
-					 GFP_KERNEL);
-	if (!pdata->properties)
-		return -ENOMEM;
-
-	/* Set the properties for portA */
-	pdata->properties->fwnode	= NULL;
-	pdata->properties->idx		= 0;
-	pdata->properties->ngpio	= INTEL_QUARK_MFD_NGPIO;
-	pdata->properties->gpio_base	= INTEL_QUARK_MFD_GPIO_BASE;
-	pdata->properties->irq[0]	= pci_irq_vector(pdev, 0);
+	res[INTEL_QUARK_IORES_IRQ].start = pci_irq_vector(pdev, 0);
+	res[INTEL_QUARK_IORES_IRQ].end = pci_irq_vector(pdev, 0);
 
-	cell->platform_data = pdata;
-	cell->pdata_size = sizeof(*pdata);
+	ret = software_node_register_node_group(intel_quark_gpio_node_group);
+	if (ret)
+		return ret;
 
+	cell->swnode = &intel_quark_gpio_controller_node;
 	return 0;
 }
 
@@ -273,10 +274,12 @@  static int intel_quark_mfd_probe(struct pci_dev *pdev,
 			      ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0,
 			      NULL);
 	if (ret)
-		goto err_free_irq_vectors;
+		goto err_unregister_gpio_node_group;
 
 	return 0;
 
+err_unregister_gpio_node_group:
+	software_node_unregister_node_group(intel_quark_gpio_node_group);
 err_free_irq_vectors:
 	pci_free_irq_vectors(pdev);
 err_unregister_i2c_clk:
@@ -287,6 +290,7 @@  static int intel_quark_mfd_probe(struct pci_dev *pdev,
 static void intel_quark_mfd_remove(struct pci_dev *pdev)
 {
 	mfd_remove_devices(&pdev->dev);
+	software_node_unregister_node_group(intel_quark_gpio_node_group);
 	pci_free_irq_vectors(pdev);
 	intel_quark_unregister_i2c_clk(&pdev->dev);
 }