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