[PATCH v7 1/3] gpio: dwapb: remove name from dwapb_port_property
This patch removed the name property from dwapb_port_property.
The name property is redundant because we can get those info
from dwapb_gpio dev and pp->idx property.
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 22 +-
drivers/mfd/intel_quark_i2c_gpio.c | 1 -
include/linux/platform_data/gpio-dwapb.h | 1 -
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..91afec8 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -409,8 +409,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
err = bgpio_init(>gc, gpio->dev, 4, dat, set, NULL, dirout,
NULL, false);
if (err) {
- dev_err(gpio->dev, "failed to init gpio chip for %s\n",
- pp->name);
+ dev_err(gpio->dev, "failed to init gpio chip\n");
return err;
}
@@ -429,8 +428,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
err = gpiochip_add_data(>gc, port);
if (err)
- dev_err(gpio->dev, "failed to register gpiochip for %s\n",
- pp->name);
+ dev_err(gpio->dev, "failed to register gpiochip\n");
else
port->is_registered = true;
@@ -480,15 +478,16 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (of_property_read_u32(port_np, "reg", >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 for port%d\n", i);
return ERR_PTR(-EINVAL);
}
if (of_property_read_u32(port_np, "snps,nr-gpios",
>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 for port%d\n",
+i);
pp->ngpio = 32;
}
@@ -499,15 +498,12 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (pp->idx == 0 &&
of_property_read_bool(port_np, "interrupt-controller")) {
pp->irq = irq_of_parse_and_map(port_np, 0);
- if (!pp->irq) {
- dev_warn(dev, "no irq for bank %s\n",
-port_np->full_name);
- }
+ if (!pp->irq)
+ dev_warn(dev, "no irq for this bank\n");
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
}
return pdata;
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
b/drivers/mfd/intel_quark_i2c_gpio.c
index bdc5e27..a4ef99b 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -220,7 +220,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev,
struct mfd_cell *cell)
/* Set the properties for portA */
pdata->properties->node = NULL;
- pdata->properties->name = "intel-quark-x1000-gpio-portA";
pdata->properties->idx = 0;
pdata->properties->ngpio= INTEL_QUARK_MFD_NGPIO;
pdata->properties->gpio_base= INTEL_QUARK_MFD_GPIO_BASE;
diff --git a/include/linux/platform_data/gpio-dwapb.h
b/include/linux/platform_data/gpio-dwapb.h
index 28702c8..955b579 100644
--- a/include/linux/platform_data/gpio-dwapb.h
+++ b/include/linux/platform_data/gpio-dwapb.h
@@ -16,7 +16,6 @@
struct dwapb_port_property {
struct device_node *node;
- const char *name;
unsigned intidx;
unsigned intngpio;
unsigned intgpio_base;
--
1.9.1
[PATCH v7 2/3] gpio: dwapb: convert device node to fwnode
This patch converts device node to fwnode for dwapb driver, so
as to provide a unified fwnode for DT and ACPI bindings.
Acked-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 37
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 91afec8..3c4d8e6 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -414,7 +415,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;
@@ -445,19 +447,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);
@@ -472,18 +470,18 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev,
"missing/invalid port index for port%d\n", i);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev,
"failed to get number of gpios for port%d\n",
@@ -495,9 +493,10 @@ 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 &&
+ fwnode_property_read_bool(fwnode,
+ "interrupt-controller")) {
+ pp->irq = irq_of_parse_and_map(to_of_node(fwnode), 0);
if (!pp->irq)
dev_warn(dev, "no irq for this bank\n");
}
@@ -519,7 +518,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);
}
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
b/drivers/mfd/intel_quark_i2c_gpio.c
index a4ef99b..a24b35f 100644
--- a/drivers/mfd/intel
[PATCH v7 1/3] gpio: dwapb: remove name from dwapb_port_property
This patch removed the name property from dwapb_port_property.
The name property is redundant because we can get those info
from dwapb_gpio dev and pp->idx property.
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 22 +-
drivers/mfd/intel_quark_i2c_gpio.c | 1 -
include/linux/platform_data/gpio-dwapb.h | 1 -
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..91afec8 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -409,8 +409,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
err = bgpio_init(>gc, gpio->dev, 4, dat, set, NULL, dirout,
NULL, false);
if (err) {
- dev_err(gpio->dev, "failed to init gpio chip for %s\n",
- pp->name);
+ dev_err(gpio->dev, "failed to init gpio chip\n");
return err;
}
@@ -429,8 +428,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
err = gpiochip_add_data(>gc, port);
if (err)
- dev_err(gpio->dev, "failed to register gpiochip for %s\n",
- pp->name);
+ dev_err(gpio->dev, "failed to register gpiochip\n");
else
port->is_registered = true;
@@ -480,15 +478,16 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (of_property_read_u32(port_np, "reg", >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 for port%d\n", i);
return ERR_PTR(-EINVAL);
}
if (of_property_read_u32(port_np, "snps,nr-gpios",
>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 for port%d\n",
+i);
pp->ngpio = 32;
}
@@ -499,15 +498,12 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (pp->idx == 0 &&
of_property_read_bool(port_np, "interrupt-controller")) {
pp->irq = irq_of_parse_and_map(port_np, 0);
- if (!pp->irq) {
- dev_warn(dev, "no irq for bank %s\n",
-port_np->full_name);
- }
+ if (!pp->irq)
+ dev_warn(dev, "no irq for this bank\n");
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
}
return pdata;
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
b/drivers/mfd/intel_quark_i2c_gpio.c
index bdc5e27..a4ef99b 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -220,7 +220,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev,
struct mfd_cell *cell)
/* Set the properties for portA */
pdata->properties->node = NULL;
- pdata->properties->name = "intel-quark-x1000-gpio-portA";
pdata->properties->idx = 0;
pdata->properties->ngpio= INTEL_QUARK_MFD_NGPIO;
pdata->properties->gpio_base= INTEL_QUARK_MFD_GPIO_BASE;
diff --git a/include/linux/platform_data/gpio-dwapb.h
b/include/linux/platform_data/gpio-dwapb.h
index 28702c8..955b579 100644
--- a/include/linux/platform_data/gpio-dwapb.h
+++ b/include/linux/platform_data/gpio-dwapb.h
@@ -16,7 +16,6 @@
struct dwapb_port_property {
struct device_node *node;
- const char *name;
unsigned intidx;
unsigned intngpio;
unsigned intgpio_base;
--
1.9.1
[PATCH v7 2/3] gpio: dwapb: convert device node to fwnode
This patch converts device node to fwnode for dwapb driver, so
as to provide a unified fwnode for DT and ACPI bindings.
Acked-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 37
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 91afec8..3c4d8e6 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -414,7 +415,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;
@@ -445,19 +447,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);
@@ -472,18 +470,18 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev,
"missing/invalid port index for port%d\n", i);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev,
"failed to get number of gpios for port%d\n",
@@ -495,9 +493,10 @@ 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 &&
+ fwnode_property_read_bool(fwnode,
+ "interrupt-controller")) {
+ pp->irq = irq_of_parse_and_map(to_of_node(fwnode), 0);
if (!pp->irq)
dev_warn(dev, "no irq for this bank\n");
}
@@ -519,7 +518,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);
}
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
b/drivers/mfd/intel_quark_i2c_gpio.c
index a4ef99b..a24b35f 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.
[PATCH v7 3/3] gpio: dwapb: add gpio-signaled acpi event support
This patch adds gpio-signaled acpi event support. It is used for
power button on hisilicon D02 board, an arm64 platform.
The corresponding DSDT file is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake,
PullUp, , " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 3c4d8e6..1cd8c20 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -27,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -434,6 +437,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
@@ -501,6 +508,9 @@ dwapb_gpio_get_pdata(struct device *dev)
dev_warn(dev, "no irq for this bank\n");
}
+ 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;
}
@@ -575,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)
{
@@ -669,6 +685,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v7 3/3] gpio: dwapb: add gpio-signaled acpi event support
This patch adds gpio-signaled acpi event support. It is used for
power button on hisilicon D02 board, an arm64 platform.
The corresponding DSDT file is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake,
PullUp, , " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg
Reviewed-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 3c4d8e6..1cd8c20 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -27,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -434,6 +437,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
@@ -501,6 +508,9 @@ dwapb_gpio_get_pdata(struct device *dev)
dev_warn(dev, "no irq for this bank\n");
}
+ 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;
}
@@ -575,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)
{
@@ -669,6 +685,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v7 0/3] gpio: dwapb: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The three patches respectively: - remove name from dwapb_port_property - convert device node to fwnode - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v6 -> v7: - add patch1 by Alan's suggestion Changes v5 -> v6: - merge patch 2~3 to one patch - small fixed from Alan's suggestion - fixed subject title reference commit history Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (3): gpio: dwapb: remove name from dwapb_port_property gpio: dwapb: convert device node to fwnode gpio: dwapb: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 76 ++-- drivers/mfd/intel_quark_i2c_gpio.c | 3 +- include/linux/platform_data/gpio-dwapb.h | 3 +- 3 files changed, 46 insertions(+), 36 deletions(-) -- 1.9.1
[PATCH v7 0/3] gpio: dwapb: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The three patches respectively: - remove name from dwapb_port_property - convert device node to fwnode - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v6 -> v7: - add patch1 by Alan's suggestion Changes v5 -> v6: - merge patch 2~3 to one patch - small fixed from Alan's suggestion - fixed subject title reference commit history Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (3): gpio: dwapb: remove name from dwapb_port_property gpio: dwapb: convert device node to fwnode gpio: dwapb: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 76 ++-- drivers/mfd/intel_quark_i2c_gpio.c | 3 +- include/linux/platform_data/gpio-dwapb.h | 3 +- 3 files changed, 46 insertions(+), 36 deletions(-) -- 1.9.1
[PATCH v6 0/2] gpio: dwapb: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - convert device node to fwnode - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v5 -> v6: - merge patch 2~3 to one patch - small fixed from Alan's suggestion - fixed subject title reference commit history Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: dwapb: convert device node to fwnode gpio: dwapb: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 69 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v6 1/2] gpio: dwapb: convert device node to fwnode
This patch converts device node to fwnode for dwapb driver,
so as to provide a unified node for DT and ACPI bindings.
Acked-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 48 +++-
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..3498393 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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,20 @@ 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 &&
+ fwnode_property_read_bool(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);
}
}
pp->irq_shared = false;
pp-&
[PATCH v6 0/2] gpio: dwapb: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - convert device node to fwnode - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v5 -> v6: - merge patch 2~3 to one patch - small fixed from Alan's suggestion - fixed subject title reference commit history Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: dwapb: convert device node to fwnode gpio: dwapb: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 69 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v6 1/2] gpio: dwapb: convert device node to fwnode
This patch converts device node to fwnode for dwapb driver,
so as to provide a unified node for DT and ACPI bindings.
Acked-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 48 +++-
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..3498393 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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,20 @@ 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 &&
+ fwnode_property_read_bool(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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->
[PATCH v6 2/2] gpio: dwapb: add gpio-signaled acpi event support
This patch adds gpio-signaled acpi event support. It is used for
power button on hisilicon D02 board, an arm64 platform.
Corresponding DSDT file is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake,
PullUp, , " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 3498393..f52adc9 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -27,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -436,6 +439,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
@@ -502,10 +509,17 @@ dwapb_gpio_get_pdata(struct device *dev)
}
}
+ 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;
+
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;
@@ -578,6 +592,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)
{
@@ -672,6 +692,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v6 2/2] gpio: dwapb: add gpio-signaled acpi event support
This patch adds gpio-signaled acpi event support. It is used for
power button on hisilicon D02 board, an arm64 platform.
Corresponding DSDT file is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake,
PullUp, , " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg
Reviewed-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 3498393..f52adc9 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -27,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -436,6 +439,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
@@ -502,10 +509,17 @@ dwapb_gpio_get_pdata(struct device *dev)
}
}
+ 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;
+
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;
@@ -578,6 +592,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)
{
@@ -672,6 +692,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v5 2/3] gpio: designware: add acpi binding
This patch adds acpi binding for designware gpio driver,
because it is used to support power button on hisilicon
d02 board.
These two bindings, DT and acpi, are compatible in this
driver.
Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com>
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 49f6e5d..2ae506f 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -449,7 +450,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -502,9 +503,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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= to_of_node(fwnode)->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;
@@ -520,7 +529,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);
}
@@ -577,6 +586,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)
{
@@ -671,6 +686,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v5 3/3] gpio: designware: add gpio-signaled acpi event support
This patch adds the support for the gpio-signaled acpi event.
This is used for power button on hisilicon D02 board, which
is an arm64 platform.
To support this function, _AEI and _Exx objects must be
defined in the corresponding GPIO device as follows:
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp,
, " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 2ae506f..043e1c2 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -28,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -437,6 +439,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
--
1.9.1
[PATCH v5 2/3] gpio: designware: add acpi binding
This patch adds acpi binding for designware gpio driver,
because it is used to support power button on hisilicon
d02 board.
These two bindings, DT and acpi, are compatible in this
driver.
Reviewed-by: Andy Shevchenko
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 49f6e5d..2ae506f 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -449,7 +450,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -502,9 +503,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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= to_of_node(fwnode)->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;
@@ -520,7 +529,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);
}
@@ -577,6 +586,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)
{
@@ -671,6 +686,7 @@ static struct platform_driver dwapb_gpio_driver = {
.name = "gpio-dwapb",
.pm = _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,
--
1.9.1
[PATCH v5 3/3] gpio: designware: add gpio-signaled acpi event support
This patch adds the support for the gpio-signaled acpi event.
This is used for power button on hisilicon D02 board, which
is an arm64 platform.
To support this function, _AEI and _Exx objects must be
defined in the corresponding GPIO device as follows:
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp,
, " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
Acked-by: Mika Westerberg
Reviewed-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 2ae506f..043e1c2 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -28,6 +28,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -437,6 +439,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(>gc);
+
return err;
}
--
1.9.1
[PATCH v5 0/3] "gpio: designware: add gpio-signaled acpi event support for power button"
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The three patches respectively: - convert device node to fwnode - add acpi binding - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (3): gpio: designware: convert device node to fwnode gpio: designware: add acpi binding gpio: designware: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 69 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v5 1/3] gpio: designware: convert device node to fwnode
This patch converts device node to fwnode in
dwapb_port_property for designware gpio driver,
so as to provide a unified data structure for DT
and ACPI bindings.
Acked-by: Andy Shevchenko <andy.shevche...@gmail.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 43 +++-
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..49f6e5d 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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;
@@ -449,17 +451,13 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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,19 @@ 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
-
[PATCH v5 0/3] "gpio: designware: add gpio-signaled acpi event support for power button"
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The three patches respectively: - convert device node to fwnode - add acpi binding - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v4 -> v5: - split into three patchs - add Andy's ACKs Changes v3 -> v4: - re-organize this two patchs by Andy's suggestion Changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (3): gpio: designware: convert device node to fwnode gpio: designware: add acpi binding gpio: designware: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 69 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 46 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v5 1/3] gpio: designware: convert device node to fwnode
This patch converts device node to fwnode in
dwapb_port_property for designware gpio driver,
so as to provide a unified data structure for DT
and ACPI bindings.
Acked-by: Andy Shevchenko
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 43 +++-
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..49f6e5d 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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;
@@ -449,17 +451,13 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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,19 @@ 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
+
[PATCH v4 2/2] gpio: designware: add gpio-signaled acpi event support
This patch adds the support for the gpio-signaled acpi event.
This is used for power button on hisilicon D02 board, which
is an arm64 platform.
To support this function, _AEI and _Exx objects must be
defined in the corresponding GPIO device as follows:
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp,
, " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 7a37c65..4955112 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -27,6 +27,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -436,6 +438,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
--
1.9.1
[PATCH v4 1/2] gpio: designware: switch device node to fwnode and add acpi binding
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.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@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 supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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);
}
[PATCH v4 2/2] gpio: designware: add gpio-signaled acpi event support
This patch adds the support for the gpio-signaled acpi event.
This is used for power button on hisilicon D02 board, which
is an arm64 platform.
To support this function, _AEI and _Exx objects must be
defined in the corresponding GPIO device as follows:
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp,
, " \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 7a37c65..4955112 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -27,6 +27,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -436,6 +438,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
--
1.9.1
[PATCH v4 1/2] gpio: designware: switch device node to fwnode and add acpi binding
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
Signed-off-by: qiujiang
---
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 supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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_
[PATCH v4 0/2] gpio: designware: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device node to fwnode and add acpi binding - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" changes v3 -> v4: - re-organize this two patchs by Andy's suggestion changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode and add acpi binding gpio: designware: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 68 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 45 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v4 0/2] gpio: designware: add gpio-signaled acpi event support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device node to fwnode and add acpi binding - add gpio-signaled acpi event support This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" changes v3 -> v4: - re-organize this two patchs by Andy's suggestion changes v2 -> v3: - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode and add acpi binding gpio: designware: add gpio-signaled acpi event support drivers/gpio/gpio-dwapb.c| 68 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 45 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v3 1/2] gpio: designware: switch device node to fwnode
This patch switch device node to fwnode in dwapb_port_property,
so as to apply a unified data structure for DT and ACPI.
This change also needs to be done in intel_quark_i2c_gpio driver,
since it depends on gpio-dwapb driver.
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 36
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..0ebbdf1 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -290,14 +290,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -415,7 +415,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->gc.of_node = pp->node;
+ port->gc.of_node = to_of_node(pp->fwnode);
#endif
port->gc.ngpio = pp->ngpio;
port->gc.base = pp->gpio_base;
@@ -449,17 +449,16 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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)
+ if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_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 +473,21 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n",
- port_np->full_name);
+ to_of_node(fwnode)->full_name);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev, "failed to get number of gpios for %s\n",
-port_np->full_name);
+to_of_node(fwnode)->full_name);
pp->ngpio = 32;
}
@@ -497,17 +496,18 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* the IP.
*/
if (pp->idx == 0 &&
- of_property_read_bool(port_np, "interrupt-controller")) {
- pp->irq = irq_of_parse_and_map(port_np, 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
+ pp->name = to_of_node(fwnode)->full_name;
}
return pdata;
diff --git a/drivers/mfd/intel_quark_i2c_g
[PATCH v3 1/2] gpio: designware: switch device node to fwnode
This patch switch device node to fwnode in dwapb_port_property,
so as to apply a unified data structure for DT and ACPI.
This change also needs to be done in intel_quark_i2c_gpio driver,
since it depends on gpio-dwapb driver.
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 36
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
include/linux/platform_data/gpio-dwapb.h | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..0ebbdf1 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -290,14 +290,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -415,7 +415,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->gc.of_node = pp->node;
+ port->gc.of_node = to_of_node(pp->fwnode);
#endif
port->gc.ngpio = pp->ngpio;
port->gc.base = pp->gpio_base;
@@ -449,17 +449,16 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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)
+ if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_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 +473,21 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n",
- port_np->full_name);
+ to_of_node(fwnode)->full_name);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev, "failed to get number of gpios for %s\n",
-port_np->full_name);
+to_of_node(fwnode)->full_name);
pp->ngpio = 32;
}
@@ -497,17 +496,18 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* the IP.
*/
if (pp->idx == 0 &&
- of_property_read_bool(port_np, "interrupt-controller")) {
- pp->irq = irq_of_parse_and_map(port_np, 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
+ pp->name = to_of_node(fwnode)->full_name;
}
return pdata;
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c
b/drivers/mfd/intel_quark_i2c_gpio.c
index 0421374..
[PATCH v3 2/2] gpio: designware: add gpio-signaled acpi events support for power button
This patch modifies the designware gpio controller driver to
support the gpio-signaled acpi events. This is used for power
button on hisilicon D02 board(an arm64 platform).
The corresponding DSDT table is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 0ebbdf1..d961d3b 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -25,6 +26,7 @@
#include
#include
#include
+#include "gpiolib.h"
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -434,6 +436,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
@@ -447,7 +453,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -455,9 +461,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
int nports;
int i;
- if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_node))
- return ERR_PTR(-ENODEV);
-
nports = device_get_child_node_count(dev);
if (nports == 0)
return ERR_PTR(-ENODEV);
@@ -479,15 +482,13 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
- dev_err(dev, "missing/invalid port index for %s\n",
- to_of_node(fwnode)->full_name);
+ dev_err(dev, "missing/invalid port index\n");
return ERR_PTR(-EINVAL);
}
if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
- dev_info(dev, "failed to get number of gpios for %s\n",
-to_of_node(fwnode)->full_name);
+ dev_info(dev, "failed to get number of gpios\n");
pp->ngpio = 32;
}
@@ -495,7 +496,7 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* Only port A can provide interrupts in all configurations of
* the IP.
*/
- if (pp->idx == 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);
@@ -505,9 +506,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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 = to_of_node(fwnode)->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 +532,7 @@ static int dwapb_gpio_probe(struct pl
[PATCH v3 2/2] gpio: designware: add gpio-signaled acpi events support for power button
This patch modifies the designware gpio controller driver to
support the gpio-signaled acpi events. This is used for power
button on hisilicon D02 board(an arm64 platform).
The corresponding DSDT table is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 0ebbdf1..d961d3b 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -25,6 +26,7 @@
#include
#include
#include
+#include "gpiolib.h"
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -434,6 +436,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
@@ -447,7 +453,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -455,9 +461,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
int nports;
int i;
- if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_node))
- return ERR_PTR(-ENODEV);
-
nports = device_get_child_node_count(dev);
if (nports == 0)
return ERR_PTR(-ENODEV);
@@ -479,15 +482,13 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
- dev_err(dev, "missing/invalid port index for %s\n",
- to_of_node(fwnode)->full_name);
+ dev_err(dev, "missing/invalid port index\n");
return ERR_PTR(-EINVAL);
}
if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
- dev_info(dev, "failed to get number of gpios for %s\n",
-to_of_node(fwnode)->full_name);
+ dev_info(dev, "failed to get number of gpios\n");
pp->ngpio = 32;
}
@@ -495,7 +496,7 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* Only port A can provide interrupts in all configurations of
* the IP.
*/
- if (pp->idx == 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);
@@ -505,9 +506,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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 = to_of_node(fwnode)->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 +532,7 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
struct dwapb_platform_data *pdata =
[PATCH v3 0/2] gpio: designware: add gpio-signaled acpi events support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device node to fwnode - adds gpio-signaled acpi events support for power button This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v2 -> v3 - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode gpio: designware: add gpio-signaled acpi events support for power button drivers/gpio/gpio-dwapb.c| 66 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 43 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v3 0/2] gpio: designware: add gpio-signaled acpi events support for power button
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device node to fwnode - adds gpio-signaled acpi events support for power button This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v2 -> v3 - fixed the build error reported by Kbuild test robot Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patch as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode gpio: designware: add gpio-signaled acpi events support for power button drivers/gpio/gpio-dwapb.c| 66 drivers/mfd/intel_quark_i2c_gpio.c | 2 +- include/linux/platform_data/gpio-dwapb.h | 2 +- 3 files changed, 43 insertions(+), 27 deletions(-) -- 1.9.1
[PATCH v2 1/2] gpio: designware: switch device node to fwnode
This patch switch device node to fwnode in dwapb_port_property,
so as to apply a unified data structure for DT and ACPI.
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 36
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..0ebbdf1 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -290,14 +290,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -415,7 +415,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->gc.of_node = pp->node;
+ port->gc.of_node = to_of_node(pp->fwnode);
#endif
port->gc.ngpio = pp->ngpio;
port->gc.base = pp->gpio_base;
@@ -449,17 +449,16 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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)
+ if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_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 +473,21 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n",
- port_np->full_name);
+ to_of_node(fwnode)->full_name);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev, "failed to get number of gpios for %s\n",
-port_np->full_name);
+to_of_node(fwnode)->full_name);
pp->ngpio = 32;
}
@@ -497,17 +496,18 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* the IP.
*/
if (pp->idx == 0 &&
- of_property_read_bool(port_np, "interrupt-controller")) {
- pp->irq = irq_of_parse_and_map(port_np, 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
+ pp->name = to_of_node(fwnode)->full_name;
}
return pdata;
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/includ
[PATCH v2 1/2] gpio: designware: switch device node to fwnode
This patch switch device node to fwnode in dwapb_port_property,
so as to apply a unified data structure for DT and ACPI.
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 36
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 597de1e..0ebbdf1 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -290,14 +290,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -415,7 +415,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->gc.of_node = pp->node;
+ port->gc.of_node = to_of_node(pp->fwnode);
#endif
port->gc.ngpio = pp->ngpio;
port->gc.base = pp->gpio_base;
@@ -449,17 +449,16 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
static struct dwapb_platform_data *
dwapb_gpio_get_pdata_of(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)
+ if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_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 +473,21 @@ 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 = >properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n",
- port_np->full_name);
+ to_of_node(fwnode)->full_name);
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
dev_info(dev, "failed to get number of gpios for %s\n",
-port_np->full_name);
+to_of_node(fwnode)->full_name);
pp->ngpio = 32;
}
@@ -497,17 +496,18 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* the IP.
*/
if (pp->idx == 0 &&
- of_property_read_bool(port_np, "interrupt-controller")) {
- pp->irq = irq_of_parse_and_map(port_np, 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);
}
}
pp->irq_shared = false;
pp->gpio_base = -1;
- pp->name= port_np->full_name;
+ pp->name = to_of_node(fwnode)->full_name;
}
return pdata;
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 intidx;
unsigned intngpio;
--
1.9.1
[PATCH v2 0/2] gpio: designware: add gpio-signaled acpi events support
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device_node to unified fwnode handle - adds gpio-signaled acpi events support for power button This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patchs as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode gpio: designware: add gpio-signaled acpi event for power button drivers/gpio/gpio-dwapb.c| 66 include/linux/platform_data/gpio-dwapb.h | 2 +- 2 files changed, 42 insertions(+), 26 deletions(-) -- 1.9.1
[PATCH v2 0/2] gpio: designware: add gpio-signaled acpi events support
This patchset adds gpio-signaled acpi events support for power button on hisilicon D02 board. The two patches respectively: - switch device_node to unified fwnode handle - adds gpio-signaled acpi events support for power button This patchset is based on https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git branch "devel" Changes v1 -> v2: - rebase to branch "devel" of Linus Walleij's repository - split in two patchs as suggested by Andy S - add Mika's ACKs qiujiang (2): gpio: designware: switch device node to fwnode gpio: designware: add gpio-signaled acpi event for power button drivers/gpio/gpio-dwapb.c| 66 include/linux/platform_data/gpio-dwapb.h | 2 +- 2 files changed, 42 insertions(+), 26 deletions(-) -- 1.9.1
[PATCH v2 2/2] gpio: designware: add gpio-signaled acpi event for power button
This patch modifies the designware gpio controller driver to
support the gpio-signaled acpi events. This is used for power
button on hisilicon D02 board(an arm64 platform).
The corresponding DSDT table is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 0ebbdf1..d961d3b 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -25,6 +26,7 @@
#include
#include
#include
+#include "gpiolib.h"
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -434,6 +436,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
@@ -447,7 +453,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -455,9 +461,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
int nports;
int i;
- if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_node))
- return ERR_PTR(-ENODEV);
-
nports = device_get_child_node_count(dev);
if (nports == 0)
return ERR_PTR(-ENODEV);
@@ -479,15 +482,13 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
- dev_err(dev, "missing/invalid port index for %s\n",
- to_of_node(fwnode)->full_name);
+ dev_err(dev, "missing/invalid port index\n");
return ERR_PTR(-EINVAL);
}
if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
- dev_info(dev, "failed to get number of gpios for %s\n",
-to_of_node(fwnode)->full_name);
+ dev_info(dev, "failed to get number of gpios\n");
pp->ngpio = 32;
}
@@ -495,7 +496,7 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* Only port A can provide interrupts in all configurations of
* the IP.
*/
- if (pp->idx == 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);
@@ -505,9 +506,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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 = to_of_node(fwnode)->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 +532,7 @@ static int dwapb_gpio_probe(struct pl
[PATCH v2 2/2] gpio: designware: add gpio-signaled acpi event for power button
This patch modifies the designware gpio controller driver to
support the gpio-signaled acpi events. This is used for power
button on hisilicon D02 board(an arm64 platform).
The corresponding DSDT table is defined as follows:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0)
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Acked-by: Mika Westerberg
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 0ebbdf1..d961d3b 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include
@@ -25,6 +26,7 @@
#include
#include
#include
+#include "gpiolib.h"
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -434,6 +436,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->gc));
+
return err;
}
@@ -447,7 +453,7 @@ 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 fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
@@ -455,9 +461,6 @@ dwapb_gpio_get_pdata_of(struct device *dev)
int nports;
int i;
- if (!IS_ENABLED(CONFIG_OF_GPIO) || !(dev->of_node))
- return ERR_PTR(-ENODEV);
-
nports = device_get_child_node_count(dev);
if (nports == 0)
return ERR_PTR(-ENODEV);
@@ -479,15 +482,13 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (fwnode_property_read_u32(fwnode, "reg", >idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
- dev_err(dev, "missing/invalid port index for %s\n",
- to_of_node(fwnode)->full_name);
+ dev_err(dev, "missing/invalid port index\n");
return ERR_PTR(-EINVAL);
}
if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
>ngpio)) {
- dev_info(dev, "failed to get number of gpios for %s\n",
-to_of_node(fwnode)->full_name);
+ dev_info(dev, "failed to get number of gpios\n");
pp->ngpio = 32;
}
@@ -495,7 +496,7 @@ dwapb_gpio_get_pdata_of(struct device *dev)
* Only port A can provide interrupts in all configurations of
* the IP.
*/
- if (pp->idx == 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);
@@ -505,9 +506,17 @@ dwapb_gpio_get_pdata_of(struct device *dev)
}
}
+ 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 = to_of_node(fwnode)->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 +532,7 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
struct dwapb_platform_data *pdata =
[PATCH v1] GPIO/ACPI: DesignWare: Add GPIO-signaled ACPI events support for power button
This patch modifies the DesignWare GPIO controller driver to
support the GPIO-signaled ACPI Events. This is used for power
button function on ARM server.
To make it work, the _AEI and _EVT object must be defined in
the corresponding GPIO driver's dsdt table in UEFI as follow:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0) // _ADR: Address
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 71
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index fcd5b0a..e482e32 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
#include
#include
@@ -24,6 +25,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -296,14 +299,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >bgc.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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode,
+ ngpio, _generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -421,7 +424,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->bgc.gc.of_node = pp->node;
+ port->bgc.gc.of_node = to_of_node(pp->fwnode);
#endif
port->bgc.gc.ngpio = pp->ngpio;
port->bgc.gc.base = pp->gpio_base;
@@ -440,6 +443,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->bgc.gc));
+
return err;
}
@@ -453,19 +460,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);
@@ -480,21 +483,19 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pdata->nports = nports;
i = 0;
- for_each_child_of_node(node, port_np) {
- pp = >properties[i++];
- pp->node = port_np;
+ device_for_each_child_node(dev, fwnode) {
+ pp = >properties[i];
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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(
[PATCH v1] GPIO/ACPI: DesignWare: Add GPIO-signaled ACPI events support for power button
This patch modifies the DesignWare GPIO controller driver to
support the GPIO-signaled ACPI Events. This is used for power
button function on ARM server.
To make it work, the _AEI and _EVT object must be defined in
the corresponding GPIO driver's dsdt table in UEFI as follow:
Device(GPI0) {
Name(_HID, "HISI0181")
Name(_ADR, 0) // _ADR: Address
Name(_UID, 0)
Name (_CRS, ResourceTemplate () {
Memory32Fixed (ReadWrite, 0x802e, 0x1)
Interrupt (ResourceConsumer, Level, ActiveHigh,
Exclusive,,,) {344}
})
Device(PRTa) {
Name (_DSD, Package () {
Package () {
Package () {"reg",0},
Package () {"snps,nr-gpios",32},
}
})
}
Name (_AEI, ResourceTemplate () {
GpioInt(Edge, ActiveLow, ExclusiveAndWake, PullUp, ,
" \\_SB.GPI0") {8}
})
Method (_E08, 0x0, NotSerialized) {
Notify (\_SB.PWRB, 0x80)
}
}
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 71
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index fcd5b0a..e482e32 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -7,6 +7,7 @@
*
* All enquiries to supp...@picochip.com
*/
+#include
#include
#include
#include
@@ -24,6 +25,8 @@
#include
#include
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR0x0c
@@ -296,14 +299,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >bgc.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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode,
+ ngpio, _generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -421,7 +424,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->bgc.gc.of_node = pp->node;
+ port->bgc.gc.of_node = to_of_node(pp->fwnode);
#endif
port->bgc.gc.ngpio = pp->ngpio;
port->bgc.gc.base = pp->gpio_base;
@@ -440,6 +443,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->bgc.gc));
+
return err;
}
@@ -453,19 +460,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);
@@ -480,21 +483,19 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pdata->nports = nports;
i = 0;
- for_each_child_of_node(node, port_np) {
- pp = >properties[i++];
- pp->node = port_np;
+ device_for_each_child_node(dev, fwnode) {
+ pp = >properties[i];
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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, "snp
[RFC PATCH] SPI/ACPI: DesignWare: Add ACPI support for Designware SPI driver
This patch added ACPI support for DesignWare SPI mmio driver. It
was based the corresponding DT driver and compatible for this two
way. This patch has been tested on Hisilicon D02 board. It relies
on the GPIO patchset.
Signed-off-by: qiujiang
---
drivers/spi/spi-dw-mmio.c | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index a6d7029..de542f0 100644
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -8,6 +8,7 @@
* version 2, as published by the Free Software Foundation.
*/
+#include
#include
#include
#include
@@ -36,7 +37,9 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
struct dw_spi *dws;
struct resource *mem;
int ret;
- int num_cs;
+ int num_cs, i;
+ struct gpio_desc *gpiod;
+ char propname[32];
dwsmmio = devm_kzalloc(>dev, sizeof(struct dw_spi_mmio),
GFP_KERNEL);
@@ -84,8 +87,6 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
dws->num_cs = num_cs;
if (pdev->dev.of_node) {
- int i;
-
for (i = 0; i < dws->num_cs; i++) {
int cs_gpio = of_get_named_gpio(pdev->dev.of_node,
"cs-gpios", i);
@@ -104,6 +105,18 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
}
}
+ if (ACPI_COMPANION(>dev)) {
+ for (i = 0; i < dws->num_cs; i++) {
+ snprintf(propname, sizeof(propname), "cs%d", i);
+ gpiod = devm_gpiod_get(>dev,
+ propname, GPIOD_ASIS);
+ if (IS_ERR(gpiod)) {
+ dev_err(>dev, "Get gpio desc failed!\n");
+ return PTR_ERR(gpiod);
+ }
+ }
+ }
+
ret = dw_spi_add_host(>dev, dws);
if (ret)
goto out;
@@ -132,12 +145,19 @@ static const struct of_device_id dw_spi_mmio_of_match[] =
{
};
MODULE_DEVICE_TABLE(of, dw_spi_mmio_of_match);
+static const struct acpi_device_id dw_spi_mmio_acpi_match[] = {
+ {"HISI0171", 0},
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match);
+
static struct platform_driver dw_spi_mmio_driver = {
.probe = dw_spi_mmio_probe,
.remove = dw_spi_mmio_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = dw_spi_mmio_of_match,
+ .acpi_match_table = ACPI_PTR(dw_spi_mmio_acpi_match),
},
};
module_platform_driver(dw_spi_mmio_driver);
--
1.9.1
[RFC PATCH] GPIO/ACPI: DesignWare: Add GPIO-signaled ACPI events support for power button
This patch modifies the DesignWare GPIO controller driver to
support the GPIO-signaled ACPI Events. This is used for power
button function on ARM server.
To make it work, the _AEI and _EVT object must be defined in
the corresponding GPIO driver's dsdt table in UEFI. At the same
time, ACPI daemon component is also necessary.
Signed-off-by: qiujiang
---
drivers/gpio/gpio-dwapb.c| 75
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index fcd5b0a..bfed2e9 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -23,6 +23,11 @@
#include
#include
#include
+#include
+#include
+
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -296,14 +301,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >bgc.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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode,
+ ngpio, _generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -421,7 +426,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->bgc.gc.of_node = pp->node;
+ port->bgc.gc.of_node = to_of_node(pp->fwnode);
#endif
port->bgc.gc.ngpio = pp->ngpio;
port->bgc.gc.base = pp->gpio_base;
@@ -440,6 +445,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->bgc.gc));
+
return err;
}
@@ -453,19 +462,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);
@@ -480,21 +485,19 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pdata->nports = nports;
i = 0;
- for_each_child_of_node(node, port_np) {
- pp = >properties[i++];
- pp->node = port_np;
+ device_for_each_child_node(dev, fwnode) {
+ pp = >properties[i];
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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;
}
@@ -502,18 +505,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")) {
+
[RFC PATCH] SPI/ACPI: DesignWare: Add ACPI support for Designware SPI driver
This patch added ACPI support for DesignWare SPI mmio driver. It
was based the corresponding DT driver and compatible for this two
way. This patch has been tested on Hisilicon D02 board. It relies
on the GPIO patchset.
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/spi/spi-dw-mmio.c | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index a6d7029..de542f0 100644
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -8,6 +8,7 @@
* version 2, as published by the Free Software Foundation.
*/
+#include
#include
#include
#include
@@ -36,7 +37,9 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
struct dw_spi *dws;
struct resource *mem;
int ret;
- int num_cs;
+ int num_cs, i;
+ struct gpio_desc *gpiod;
+ char propname[32];
dwsmmio = devm_kzalloc(>dev, sizeof(struct dw_spi_mmio),
GFP_KERNEL);
@@ -84,8 +87,6 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
dws->num_cs = num_cs;
if (pdev->dev.of_node) {
- int i;
-
for (i = 0; i < dws->num_cs; i++) {
int cs_gpio = of_get_named_gpio(pdev->dev.of_node,
"cs-gpios", i);
@@ -104,6 +105,18 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
}
}
+ if (ACPI_COMPANION(>dev)) {
+ for (i = 0; i < dws->num_cs; i++) {
+ snprintf(propname, sizeof(propname), "cs%d", i);
+ gpiod = devm_gpiod_get(>dev,
+ propname, GPIOD_ASIS);
+ if (IS_ERR(gpiod)) {
+ dev_err(>dev, "Get gpio desc failed!\n");
+ return PTR_ERR(gpiod);
+ }
+ }
+ }
+
ret = dw_spi_add_host(>dev, dws);
if (ret)
goto out;
@@ -132,12 +145,19 @@ static const struct of_device_id dw_spi_mmio_of_match[] =
{
};
MODULE_DEVICE_TABLE(of, dw_spi_mmio_of_match);
+static const struct acpi_device_id dw_spi_mmio_acpi_match[] = {
+ {"HISI0171", 0},
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match);
+
static struct platform_driver dw_spi_mmio_driver = {
.probe = dw_spi_mmio_probe,
.remove = dw_spi_mmio_remove,
.driver = {
.name = DRIVER_NAME,
.of_match_table = dw_spi_mmio_of_match,
+ .acpi_match_table = ACPI_PTR(dw_spi_mmio_acpi_match),
},
};
module_platform_driver(dw_spi_mmio_driver);
--
1.9.1
[RFC PATCH] GPIO/ACPI: DesignWare: Add GPIO-signaled ACPI events support for power button
This patch modifies the DesignWare GPIO controller driver to
support the GPIO-signaled ACPI Events. This is used for power
button function on ARM server.
To make it work, the _AEI and _EVT object must be defined in
the corresponding GPIO driver's dsdt table in UEFI. At the same
time, ACPI daemon component is also necessary.
Signed-off-by: qiujiang <qiuji...@huawei.com>
---
drivers/gpio/gpio-dwapb.c| 75
include/linux/platform_data/gpio-dwapb.h | 2 +-
2 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index fcd5b0a..bfed2e9 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -23,6 +23,11 @@
#include
#include
#include
+#include
+#include
+
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -296,14 +301,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = >bgc.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,
-_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode,
+ ngpio, _generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -421,7 +426,7 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->bgc.gc.of_node = pp->node;
+ port->bgc.gc.of_node = to_of_node(pp->fwnode);
#endif
port->bgc.gc.ngpio = pp->ngpio;
port->bgc.gc.base = pp->gpio_base;
@@ -440,6 +445,10 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
else
port->is_registered = true;
+ /* Add GPIO-signaled ACPI event support */
+ if (pp->irq)
+ acpi_gpiochip_request_interrupts(&(port->bgc.gc));
+
return err;
}
@@ -453,19 +462,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);
@@ -480,21 +485,19 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pdata->nports = nports;
i = 0;
- for_each_child_of_node(node, port_np) {
- pp = >properties[i++];
- pp->node = port_np;
+ device_for_each_child_node(dev, fwnode) {
+ pp = >properties[i];
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", >idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", >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",
>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;
}
@@ -502,18 +505,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(fwnod
