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
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, 0x802e0000, 0x10000)
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 <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: qiujiang <[email protected]>
---
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 [email protected]
*/
+#include <linux/acpi.h>
#include <linux/gpio/driver.h>
/* FIXME: for gpio_get_value(), replace this with direct register read */
#include <linux/gpio.h>
@@ -27,6 +28,8 @@
#include <linux/platform_data/gpio-dwapb.h>
#include <linux/slab.h>
+#include "gpiolib.h"
+
#define GPIO_SWPORTA_DR 0x00
#define GPIO_SWPORTA_DDR 0x04
#define GPIO_SWPORTB_DR 0x0c
@@ -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(&port->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 = &dwapb_gpio_pm_ops,
.of_match_table = of_match_ptr(dwapb_of_match),
+ .acpi_match_table = ACPI_PTR(dwapb_acpi_match),
},
.probe = dwapb_gpio_probe,
.remove = dwapb_gpio_remove,
--
1.9.1
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 <[email protected]>
Signed-off-by: qiujiang <[email protected]>
---
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 <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include <linux/spinlock.h>
#include <linux/platform_data/gpio-dwapb.h>
#include <linux/slab.h>
@@ -290,14 +291,14 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct dwapb_port_property *pp)
{
struct gpio_chip *gc = &port->gc;
- struct device_node *node = pp->node;
+ struct fwnode_handle *fwnode = pp->fwnode;
struct irq_chip_generic *irq_gc = NULL;
unsigned int hwirq, ngpio = gc->ngpio;
struct irq_chip_type *ct;
int err, i;
- gpio->domain = irq_domain_add_linear(node, ngpio,
- &irq_generic_chip_ops, gpio);
+ gpio->domain = irq_domain_create_linear(fwnode, ngpio,
+ &irq_generic_chip_ops, gpio);
if (!gpio->domain)
return;
@@ -415,7 +416,8 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
}
#ifdef CONFIG_OF_GPIO
- port->gc.of_node = pp->node;
+ port->gc.of_node = is_of_node(pp->fwnode) ?
+ to_of_node(pp->fwnode) : NULL;
#endif
port->gc.ngpio = pp->ngpio;
port->gc.base = pp->gpio_base;
@@ -447,19 +449,15 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
}
static struct dwapb_platform_data *
-dwapb_gpio_get_pdata_of(struct device *dev)
+dwapb_gpio_get_pdata(struct device *dev)
{
- struct device_node *node, *port_np;
+ struct fwnode_handle *fwnode;
struct dwapb_platform_data *pdata;
struct dwapb_port_property *pp;
int nports;
int i;
- node = dev->of_node;
- if (!IS_ENABLED(CONFIG_OF_GPIO) || !node)
- return ERR_PTR(-ENODEV);
-
- nports = of_get_child_count(node);
+ nports = device_get_child_node_count(dev);
if (nports == 0)
return ERR_PTR(-ENODEV);
@@ -474,21 +472,19 @@ dwapb_gpio_get_pdata_of(struct device *dev)
pdata->nports = nports;
i = 0;
- for_each_child_of_node(node, port_np) {
+ device_for_each_child_node(dev, fwnode) {
pp = &pdata->properties[i++];
- pp->node = port_np;
+ pp->fwnode = fwnode;
- if (of_property_read_u32(port_np, "reg", &pp->idx) ||
+ if (fwnode_property_read_u32(fwnode, "reg", &pp->idx) ||
pp->idx >= DWAPB_MAX_PORTS) {
- dev_err(dev, "missing/invalid port index for %s\n",
- port_np->full_name);
+ dev_err(dev, "missing/invalid port index\n");
return ERR_PTR(-EINVAL);
}
- if (of_property_read_u32(port_np, "snps,nr-gpios",
+ if (fwnode_property_read_u32(fwnode, "snps,nr-gpios",
&pp->ngpio)) {
- dev_info(dev, "failed to get number of gpios for %s\n",
- port_np->full_name);
+ dev_info(dev, "failed to get number of gpios\n");
pp->ngpio = 32;
}
@@ -496,18 +492,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->full_name;
+ if (dev->of_node)
+ pp->name = to_of_node(fwnode)->full_name;
}
return pdata;
@@ -523,7 +521,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 bdc5e27..958ed26 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -219,7 +219,7 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
return -ENOMEM;
/* Set the properties for portA */
- pdata->properties->node = NULL;
+ pdata->properties->fwnode = NULL;
pdata->properties->name = "intel-quark-x1000-gpio-portA";
pdata->properties->idx = 0;
pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO;
diff --git a/include/linux/platform_data/gpio-dwapb.h b/include/linux/platform_data/gpio-dwapb.h
index 28702c8..c5bd1f2 100644
--- a/include/linux/platform_data/gpio-dwapb.h
+++ b/include/linux/platform_data/gpio-dwapb.h
@@ -15,7 +15,7 @@
#define GPIO_DW_APB_H
struct dwapb_port_property {
- struct device_node *node;
+ struct fwnode_handle *fwnode;
const char *name;
unsigned int idx;
unsigned int ngpio;
--
1.9.1
On Fri, Mar 25, 2016 at 9:31 PM, qiujiang <[email protected]> wrote:
> - 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->full_name;
> + if (dev->of_node)
> + pp->name = to_of_node(fwnode)->full_name;
Hi Jiang,
I tested lightly on a CycloneV and it worked fine (with device tree).
One suggestion for both patches: you could remove name from struct
dwapb_port_property and get rid of pp->name and nobody would miss it.
All it is used for is some dev_err's so the device info gets printed
anyway. For example (if I leave the irq out of the DT)
gpio-dwapb ff708000.gpio: no irq for bank /soc/gpio@ff708000/gpio-controller@0
is redundant. The only additional info here from the name is the port
index. That could be added to the messages without having to get the
name through the two property/of methods.
Alan
On Tue, Mar 29, 2016 at 7:30 PM, Alan Tull <[email protected]> wrote:
> On Fri, Mar 25, 2016 at 9:31 PM, qiujiang <[email protected]> wrote:
>
>> - 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->full_name;
>> + if (dev->of_node)
>> + pp->name = to_of_node(fwnode)->full_name;
>
> Hi Jiang,
>
> I tested lightly on a CycloneV and it worked fine (with device tree).
>
> One suggestion for both patches: you could remove name from struct
> dwapb_port_property and get rid of pp->name and nobody would miss it.
> All it is used for is some dev_err's so the device info gets printed
> anyway. For example (if I leave the irq out of the DT)
>
> gpio-dwapb ff708000.gpio: no irq for bank /soc/gpio@ff708000/gpio-controller@0
>
> is redundant. The only additional info here from the name is the port
> index. That could be added to the messages without having to get the
> name through the two property/of methods.
>
Good suggestion! That'll make patches and code cleaner.
Perhaps separate prepended patch?
--
With Best Regards,
Andy Shevchenko
On Sat, Mar 26, 2016 at 4:31 AM, qiujiang <[email protected]> wrote:
> This patch adds gpio-signaled acpi event support. It is used for
> power button on hisilicon D02 board, an arm64 platform.
Yes, looks good, my tag stays.
> @@ -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;
This change doesn't belong the patch, though it should gone with the
two lines of pp->name assignment as per Alan's suggestion to get rid
of pp->name completely.
> +
> + if (has_acpi_companion(dev))
> + pp->name = acpi_dev_name(to_acpi_device_node(fwnode));
--
With Best Regards,
Andy Shevchenko
在 2016/3/30 19:38, Andy Shevchenko 写道:
> On Tue, Mar 29, 2016 at 7:30 PM, Alan Tull <[email protected]> wrote:
>> On Fri, Mar 25, 2016 at 9:31 PM, qiujiang <[email protected]> wrote:
>>
>>> - 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->full_name;
>>> + if (dev->of_node)
>>> + pp->name = to_of_node(fwnode)->full_name;
>>
>> Hi Jiang,
>>
>> I tested lightly on a CycloneV and it worked fine (with device tree).
>>
>> One suggestion for both patches: you could remove name from struct
>> dwapb_port_property and get rid of pp->name and nobody would miss it.
>> All it is used for is some dev_err's so the device info gets printed
>> anyway. For example (if I leave the irq out of the DT)
>>
>> gpio-dwapb ff708000.gpio: no irq for bank /soc/gpio@ff708000/gpio-controller@0
>>
>> is redundant. The only additional info here from the name is the port
>> index. That could be added to the messages without having to get the
>> name through the two property/of methods.
>>
>
> Good suggestion! That'll make patches and code cleaner.
>
> Perhaps separate prepended patch?
>
Hi Alan/Andy,
It sounds good, I will follow this suggestion and do a test. But, what's the
"separate prepended patch" mean?
Thanks, Jiang
在 2016/3/30 19:41, Andy Shevchenko 写道:
> On Sat, Mar 26, 2016 at 4:31 AM, qiujiang <[email protected]> wrote:
>> This patch adds gpio-signaled acpi event support. It is used for
>> power button on hisilicon D02 board, an arm64 platform.
>
> Yes, looks good, my tag stays.
>
>> @@ -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;
>
> This change doesn't belong the patch, though it should gone with the
> two lines of pp->name assignment as per Alan's suggestion to get rid
> of pp->name completely.
Agree, I plan to take Alan's suggestion, thank you.
>
>> +
>> + if (has_acpi_companion(dev))
>> + pp->name = acpi_dev_name(to_acpi_device_node(fwnode));
>
On Thu, Mar 31, 2016 at 3:51 AM, Jiang Qiu <[email protected]> wrote:
> 在 2016/3/30 19:38, Andy Shevchenko 写道:
>>> One suggestion for both patches: you could remove name from struct
>>> dwapb_port_property and get rid of pp->name and nobody would miss it.
>>> All it is used for is some dev_err's so the device info gets printed
>>> anyway. For example (if I leave the irq out of the DT)
>>>
>>> gpio-dwapb ff708000.gpio: no irq for bank /soc/gpio@ff708000/gpio-controller@0
>>>
>>> is redundant. The only additional info here from the name is the port
>>> index. That could be added to the messages without having to get the
>>> name through the two property/of methods.
>>>
>>
>> Good suggestion! That'll make patches and code cleaner.
>>
>> Perhaps separate prepended patch?
>>
> Hi Alan/Andy,
>
> It sounds good, I will follow this suggestion and do a test. But, what's the
> "separate prepended patch" mean?
Preparatory patch which goes first in the series.
--
With Best Regards,
Andy Shevchenko