[v4,1/2] gpio: designware: switch device node to fwnode and add acpi binding
diff mbox

Message ID 1456751596-98963-2-git-send-email-qiujiang@huawei.com
State New
Headers show

Commit Message

qiujiang Feb. 29, 2016, 1:13 p.m. UTC
This patch switches device node to fwnode and adds acpi
binding. As a result, DT and acpi bingdings are compatible
for this driver.

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: qiujiang <qiujiang@huawei.com>
---
 drivers/gpio/gpio-dwapb.c                | 62 +++++++++++++++++++-------------
 drivers/mfd/intel_quark_i2c_gpio.c       |  2 +-
 include/linux/platform_data/gpio-dwapb.h |  2 +-
 3 files changed, 39 insertions(+), 27 deletions(-)

Comments

Andy Shevchenko Feb. 29, 2016, 1:51 p.m. UTC | #1
On Mon, Feb 29, 2016 at 3:13 PM, qiujiang <qiujiang@huawei.com> wrote:
> This patch switches device node to fwnode and adds acpi
> binding. As a result, DT and acpi bingdings are compatible
> for this driver.

I'm not sure it makes sense to add ACPI binding here. It more logical
to me to add them in patch 2/2.
And I see that it touches different subsystems.

>
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Due to above and Mika's Ack was only to ACPI parts, I think
you may be split this also to two and we will have clearly logical set:
1. Convert to fwnode
2. Add ACPI bindings
3. ACPI event support.

Does it sound okay to you?

If you do that I give my
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
to intel_quark_i2c_gpio.c part and
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
to the rest.

> Signed-off-by: qiujiang <qiujiang@huawei.com>
> ---
>  drivers/gpio/gpio-dwapb.c                | 62 +++++++++++++++++++-------------
>  drivers/mfd/intel_quark_i2c_gpio.c       |  2 +-
>  include/linux/platform_data/gpio-dwapb.h |  2 +-
>  3 files changed, 39 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
> index 597de1e..7a37c65 100644
> --- a/drivers/gpio/gpio-dwapb.c
> +++ b/drivers/gpio/gpio-dwapb.c
> @@ -7,6 +7,7 @@
>   *
>   * All enquiries to support@picochip.com
>   */
> +#include <linux/acpi.h>

+#include <linux/property.h> instead (see above).

>  #include <linux/gpio/driver.h>
>  /* FIXME: for gpio_get_value(), replace this with direct register read */
>  #include <linux/gpio.h>

> @@ -496,18 +492,27 @@ dwapb_gpio_get_pdata_of(struct device *dev)
>                  * Only port A can provide interrupts in all configurations of
>                  * the IP.
>                  */
> -               if (pp->idx == 0 &&
> -                   of_property_read_bool(port_np, "interrupt-controller")) {
> -                       pp->irq = irq_of_parse_and_map(port_np, 0);
> +               if (dev->of_node && pp->idx == 0 &&
> +                       of_property_read_bool(to_of_node(fwnode),
> +                               "interrupt-controller")) {

> +               if (has_acpi_companion(dev) && pp->idx == 0)
> +                       pp->irq = platform_get_irq(to_platform_device(dev), 0);
> +

To patch 2.

>                 pp->irq_shared  = false;
>                 pp->gpio_base   = -1;

> -               pp->name        = port_np->full_name;
> +
> +               if (dev->of_node)
> +                       pp->name = to_of_node(fwnode)->full_name;
> +

And here you have to provide something in case of default / built-in
device properties.


> +               if (has_acpi_companion(dev))
> +                       pp->name = acpi_dev_name(to_acpi_device_node(fwnode));

To patch 2.

>         }
>
>         return pdata;

> @@ -580,6 +585,12 @@ static const struct of_device_id dwapb_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, dwapb_of_match);
>
> +static const struct acpi_device_id dwapb_acpi_match[] = {
> +       {"HISI0181", 0},
> +       { }
> +};
> +MODULE_DEVICE_TABLE(acpi, dwapb_acpi_match);
> +
>  #ifdef CONFIG_PM_SLEEP
>  static int dwapb_gpio_suspend(struct device *dev)
>  {
> @@ -674,6 +685,7 @@ static struct platform_driver dwapb_gpio_driver = {
>                 .name   = "gpio-dwapb",
>                 .pm     = &dwapb_gpio_pm_ops,
>                 .of_match_table = of_match_ptr(dwapb_of_match),
> +               .acpi_match_table = ACPI_PTR(dwapb_acpi_match),
>         },
>         .probe          = dwapb_gpio_probe,
>         .remove         = dwapb_gpio_remove,

Ditto to the above hunks.
qiujiang March 1, 2016, 1:09 a.m. UTC | #2
在 2016/2/29 21:51, Andy Shevchenko 写道:
> On Mon, Feb 29, 2016 at 3:13 PM, qiujiang <qiujiang@huawei.com> wrote:
>> This patch switches device node to fwnode and adds acpi
>> binding. As a result, DT and acpi bingdings are compatible
>> for this driver.
> 
> I'm not sure it makes sense to add ACPI binding here. It more logical
> to me to add them in patch 2/2.
> And I see that it touches different subsystems.
> 
>>
>> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> Due to above and Mika's Ack was only to ACPI parts, I think
> you may be split this also to two and we will have clearly logical set:
> 1. Convert to fwnode
> 2. Add ACPI bindings
> 3. ACPI event support.
> 
> Does it sound okay to you?
> 
Sure, I will do that ASAP, thank you.
> If you do that I give my
> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> to intel_quark_i2c_gpio.c part and
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> to the rest.
> 
>> Signed-off-by: qiujiang <qiujiang@huawei.com>
>> ---
>>  drivers/gpio/gpio-dwapb.c                | 62 +++++++++++++++++++-------------
>>  drivers/mfd/intel_quark_i2c_gpio.c       |  2 +-
>>  include/linux/platform_data/gpio-dwapb.h |  2 +-
>>  3 files changed, 39 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
>> index 597de1e..7a37c65 100644
>> --- a/drivers/gpio/gpio-dwapb.c
>> +++ b/drivers/gpio/gpio-dwapb.c
>> @@ -7,6 +7,7 @@
>>   *
>>   * All enquiries to support@picochip.com
>>   */
>> +#include <linux/acpi.h>
> 
> +#include <linux/property.h> instead (see above).
> 
>>  #include <linux/gpio/driver.h>
>>  /* FIXME: for gpio_get_value(), replace this with direct register read */
>>  #include <linux/gpio.h>
> 
>> @@ -496,18 +492,27 @@ dwapb_gpio_get_pdata_of(struct device *dev)
>>                  * Only port A can provide interrupts in all configurations of
>>                  * the IP.
>>                  */
>> -               if (pp->idx == 0 &&
>> -                   of_property_read_bool(port_np, "interrupt-controller")) {
>> -                       pp->irq = irq_of_parse_and_map(port_np, 0);
>> +               if (dev->of_node && pp->idx == 0 &&
>> +                       of_property_read_bool(to_of_node(fwnode),
>> +                               "interrupt-controller")) {
> 
>> +               if (has_acpi_companion(dev) && pp->idx == 0)
>> +                       pp->irq = platform_get_irq(to_platform_device(dev), 0);
>> +
> 
> To patch 2.
> 
>>                 pp->irq_shared  = false;
>>                 pp->gpio_base   = -1;
> 
>> -               pp->name        = port_np->full_name;
>> +
>> +               if (dev->of_node)
>> +                       pp->name = to_of_node(fwnode)->full_name;
>> +
> 
> And here you have to provide something in case of default / built-in
> device properties.
> 
> 
>> +               if (has_acpi_companion(dev))
>> +                       pp->name = acpi_dev_name(to_acpi_device_node(fwnode));
> 
> To patch 2.
> 
>>         }
>>
>>         return pdata;
> 
>> @@ -580,6 +585,12 @@ static const struct of_device_id dwapb_of_match[] = {
>>  };
>>  MODULE_DEVICE_TABLE(of, dwapb_of_match);
>>
>> +static const struct acpi_device_id dwapb_acpi_match[] = {
>> +       {"HISI0181", 0},
>> +       { }
>> +};
>> +MODULE_DEVICE_TABLE(acpi, dwapb_acpi_match);
>> +
>>  #ifdef CONFIG_PM_SLEEP
>>  static int dwapb_gpio_suspend(struct device *dev)
>>  {
>> @@ -674,6 +685,7 @@ static struct platform_driver dwapb_gpio_driver = {
>>                 .name   = "gpio-dwapb",
>>                 .pm     = &dwapb_gpio_pm_ops,
>>                 .of_match_table = of_match_ptr(dwapb_of_match),
>> +               .acpi_match_table = ACPI_PTR(dwapb_acpi_match),
>>         },
>>         .probe          = dwapb_gpio_probe,
>>         .remove         = dwapb_gpio_remove,
> 
> Ditto to the above hunks.
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
qiujiang March 1, 2016, 6:41 a.m. UTC | #3
在 2016/2/29 21:51, Andy Shevchenko 写道:
> On Mon, Feb 29, 2016 at 3:13 PM, qiujiang <qiujiang@huawei.com> wrote:
>> This patch switches device node to fwnode and adds acpi
>> binding. As a result, DT and acpi bingdings are compatible
>> for this driver.
> 
> I'm not sure it makes sense to add ACPI binding here. It more logical
> to me to add them in patch 2/2.
> And I see that it touches different subsystems.
> 
>>
>> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> Due to above and Mika's Ack was only to ACPI parts, I think
> you may be split this also to two and we will have clearly logical set:
> 1. Convert to fwnode
> 2. Add ACPI bindings
> 3. ACPI event support.
> 
> Does it sound okay to you?
> 
> If you do that I give my
> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> to intel_quark_i2c_gpio.c part and
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> to the rest.
> 
>> Signed-off-by: qiujiang <qiujiang@huawei.com>
>> ---
>>  drivers/gpio/gpio-dwapb.c                | 62 +++++++++++++++++++-------------
>>  drivers/mfd/intel_quark_i2c_gpio.c       |  2 +-
>>  include/linux/platform_data/gpio-dwapb.h |  2 +-
>>  3 files changed, 39 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
>> index 597de1e..7a37c65 100644
>> --- a/drivers/gpio/gpio-dwapb.c
>> +++ b/drivers/gpio/gpio-dwapb.c
>> @@ -7,6 +7,7 @@
>>   *
>>   * All enquiries to support@picochip.com
>>   */
>> +#include <linux/acpi.h>
> 
> +#include <linux/property.h> instead (see above).
> 
>>  #include <linux/gpio/driver.h>
>>  /* FIXME: for gpio_get_value(), replace this with direct register read */
>>  #include <linux/gpio.h>
> 
>> @@ -496,18 +492,27 @@ dwapb_gpio_get_pdata_of(struct device *dev)
>>                  * Only port A can provide interrupts in all configurations of
>>                  * the IP.
>>                  */
>> -               if (pp->idx == 0 &&
>> -                   of_property_read_bool(port_np, "interrupt-controller")) {
>> -                       pp->irq = irq_of_parse_and_map(port_np, 0);
>> +               if (dev->of_node && pp->idx == 0 &&
>> +                       of_property_read_bool(to_of_node(fwnode),
>> +                               "interrupt-controller")) {
> 
>> +               if (has_acpi_companion(dev) && pp->idx == 0)
>> +                       pp->irq = platform_get_irq(to_platform_device(dev), 0);
>> +
> 
> To patch 2.
> 
>>                 pp->irq_shared  = false;
>>                 pp->gpio_base   = -1;
> 
>> -               pp->name        = port_np->full_name;
>> +
>> +               if (dev->of_node)
>> +                       pp->name = to_of_node(fwnode)->full_name;
>> +
> 
> And here you have to provide something in case of default / built-in
> device properties.
Sorry, I'm not very clear here about the case of default / built-in device
properties, can you give a example about what will the code look like ?
> 
> 
>> +               if (has_acpi_companion(dev))
>> +                       pp->name = acpi_dev_name(to_acpi_device_node(fwnode));
> 
> To patch 2.
> 
>>         }
>>
>>         return pdata;
> 
>> @@ -580,6 +585,12 @@ static const struct of_device_id dwapb_of_match[] = {
>>  };
>>  MODULE_DEVICE_TABLE(of, dwapb_of_match);
>>
>> +static const struct acpi_device_id dwapb_acpi_match[] = {
>> +       {"HISI0181", 0},
>> +       { }
>> +};
>> +MODULE_DEVICE_TABLE(acpi, dwapb_acpi_match);
>> +
>>  #ifdef CONFIG_PM_SLEEP
>>  static int dwapb_gpio_suspend(struct device *dev)
>>  {
>> @@ -674,6 +685,7 @@ static struct platform_driver dwapb_gpio_driver = {
>>                 .name   = "gpio-dwapb",
>>                 .pm     = &dwapb_gpio_pm_ops,
>>                 .of_match_table = of_match_ptr(dwapb_of_match),
>> +               .acpi_match_table = ACPI_PTR(dwapb_acpi_match),
>>         },
>>         .probe          = dwapb_gpio_probe,
>>         .remove         = dwapb_gpio_remove,
> 
> Ditto to the above hunks.
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..7a37c65 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@ 
  *
  * All enquiries to support@picochip.com
  */
+#include <linux/acpi.h>
 #include <linux/gpio/driver.h>
 /* FIXME: for gpio_get_value(), replace this with direct register read */
 #include <linux/gpio.h>
@@ -290,14 +291,14 @@  static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
 				 struct dwapb_port_property *pp)
 {
 	struct gpio_chip *gc = &port->gc;
-	struct device_node *node = pp->node;
+	struct fwnode_handle  *fwnode = pp->fwnode;
 	struct irq_chip_generic	*irq_gc = NULL;
 	unsigned int hwirq, ngpio = gc->ngpio;
 	struct irq_chip_type *ct;
 	int err, i;
 
-	gpio->domain = irq_domain_add_linear(node, ngpio,
-					     &irq_generic_chip_ops, gpio);
+	gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+						 &irq_generic_chip_ops, gpio);
 	if (!gpio->domain)
 		return;
 
@@ -415,7 +416,8 @@  static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
 	}
 
 #ifdef CONFIG_OF_GPIO
-	port->gc.of_node = pp->node;
+	port->gc.of_node = is_of_node(pp->fwnode) ?
+		to_of_node(pp->fwnode) : NULL;
 #endif
 	port->gc.ngpio = pp->ngpio;
 	port->gc.base = pp->gpio_base;
@@ -447,19 +449,15 @@  static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
 }
 
 static struct dwapb_platform_data *
-dwapb_gpio_get_pdata_of(struct device *dev)
+dwapb_gpio_get_pdata(struct device *dev)
 {
-	struct device_node *node, *port_np;
+	struct fwnode_handle *fwnode;
 	struct dwapb_platform_data *pdata;
 	struct dwapb_port_property *pp;
 	int nports;
 	int i;
 
-	node = dev->of_node;
-	if (!IS_ENABLED(CONFIG_OF_GPIO) || !node)
-		return ERR_PTR(-ENODEV);
-
-	nports = of_get_child_count(node);
+	nports = device_get_child_node_count(dev);
 	if (nports == 0)
 		return ERR_PTR(-ENODEV);
 
@@ -474,21 +472,19 @@  dwapb_gpio_get_pdata_of(struct device *dev)
 	pdata->nports = nports;
 
 	i = 0;
-	for_each_child_of_node(node, port_np) {
+	device_for_each_child_node(dev, fwnode)  {
 		pp = &pdata->properties[i++];
-		pp->node = port_np;
+		pp->fwnode = fwnode;
 
-		if (of_property_read_u32(port_np, "reg", &pp->idx) ||
+		if (fwnode_property_read_u32(fwnode, "reg", &pp->idx) ||
 		    pp->idx >= DWAPB_MAX_PORTS) {
-			dev_err(dev, "missing/invalid port index for %s\n",
-				port_np->full_name);
+			dev_err(dev, "missing/invalid port index\n");
 			return ERR_PTR(-EINVAL);
 		}
 
-		if (of_property_read_u32(port_np, "snps,nr-gpios",
+		if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
 					 &pp->ngpio)) {
-			dev_info(dev, "failed to get number of gpios for %s\n",
-				 port_np->full_name);
+			dev_info(dev, "failed to get number of gpios\n");
 			pp->ngpio = 32;
 		}
 
@@ -496,18 +492,27 @@  dwapb_gpio_get_pdata_of(struct device *dev)
 		 * Only port A can provide interrupts in all configurations of
 		 * the IP.
 		 */
-		if (pp->idx == 0 &&
-		    of_property_read_bool(port_np, "interrupt-controller")) {
-			pp->irq = irq_of_parse_and_map(port_np, 0);
+		if (dev->of_node && pp->idx == 0 &&
+			of_property_read_bool(to_of_node(fwnode),
+				"interrupt-controller")) {
+			pp->irq = irq_of_parse_and_map(to_of_node(fwnode), 0);
 			if (!pp->irq) {
 				dev_warn(dev, "no irq for bank %s\n",
-					 port_np->full_name);
+					 to_of_node(fwnode)->full_name);
 			}
 		}
 
+		if (has_acpi_companion(dev) && pp->idx == 0)
+			pp->irq = platform_get_irq(to_platform_device(dev), 0);
+
 		pp->irq_shared	= false;
 		pp->gpio_base	= -1;
-		pp->name	= port_np->full_name;
+
+		if (dev->of_node)
+			pp->name = to_of_node(fwnode)->full_name;
+
+		if (has_acpi_companion(dev))
+			pp->name = acpi_dev_name(to_acpi_device_node(fwnode));
 	}
 
 	return pdata;
@@ -523,7 +528,7 @@  static int dwapb_gpio_probe(struct platform_device *pdev)
 	struct dwapb_platform_data *pdata = dev_get_platdata(dev);
 
 	if (!pdata) {
-		pdata = dwapb_gpio_get_pdata_of(dev);
+		pdata = dwapb_gpio_get_pdata(dev);
 		if (IS_ERR(pdata))
 			return PTR_ERR(pdata);
 	}
@@ -580,6 +585,12 @@  static const struct of_device_id dwapb_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dwapb_of_match);
 
+static const struct acpi_device_id dwapb_acpi_match[] = {
+	{"HISI0181", 0},
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, dwapb_acpi_match);
+
 #ifdef CONFIG_PM_SLEEP
 static int dwapb_gpio_suspend(struct device *dev)
 {
@@ -674,6 +685,7 @@  static struct platform_driver dwapb_gpio_driver = {
 		.name	= "gpio-dwapb",
 		.pm	= &dwapb_gpio_pm_ops,
 		.of_match_table = of_match_ptr(dwapb_of_match),
+		.acpi_match_table = ACPI_PTR(dwapb_acpi_match),
 	},
 	.probe		= dwapb_gpio_probe,
 	.remove		= dwapb_gpio_remove,
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index 0421374..265bd3c 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -227,7 +227,7 @@  static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
 		return -ENOMEM;
 
 	/* Set the properties for portA */
-	pdata->properties->node		= NULL;
+	pdata->properties->fwnode	= NULL;
 	pdata->properties->name		= "intel-quark-x1000-gpio-portA";
 	pdata->properties->idx		= 0;
 	pdata->properties->ngpio	= INTEL_QUARK_MFD_NGPIO;
diff --git a/include/linux/platform_data/gpio-dwapb.h b/include/linux/platform_data/gpio-dwapb.h
index 28702c8..80954f2 100644
--- a/include/linux/platform_data/gpio-dwapb.h
+++ b/include/linux/platform_data/gpio-dwapb.h
@@ -15,7 +15,7 @@ 
 #define GPIO_DW_APB_H
 
 struct dwapb_port_property {
-	struct device_node *node;
+	struct fwnode_handle  *fwnode;
 	const char	*name;
 	unsigned int	idx;
 	unsigned int	ngpio;