| Message ID | 1523606900-2332-3-git-send-email-phil.edworthy@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Phil, On Fri, Apr 13, 2018 at 10:08 AM, Phil Edworthy <phil.edworthy@renesas.com> wrote: > Since the way the Synopsys GPIO interrupts are stored has changed, this > driver needs to be updated in line with the changes. > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> > --- > v2: > - New patch in v2 to fix the only other user of struct dwapb_port_property. Thanks for your patch! To avoid bisection compile failures due to the changed type of dwapb_port_property.irq, I think this should be folded into the first patch, > --- > drivers/mfd/intel_quark_i2c_gpio.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c > index 90e35de..5bddb84 100644 > --- a/drivers/mfd/intel_quark_i2c_gpio.c > +++ b/drivers/mfd/intel_quark_i2c_gpio.c > @@ -233,7 +233,8 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell) > pdata->properties->idx = 0; > pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; > pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE; > - pdata->properties->irq = pdev->irq; > + pdata->properties->irq[0] = pdev->irq; > + pdata->properties->has_irq = true; > pdata->properties->irq_shared = true; > > cell->platform_data = pdata; Gr{oetje,eeting}s, Geert
Hi Geert, On 13 April 2018 09:20 Geert Uytterhoeven wrote: > On Fri, Apr 13, 2018 at 10:08 AM, Phil Edworthy wrote: > > Since the way the Synopsys GPIO interrupts are stored has changed, > > this driver needs to be updated in line with the changes. > > > > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> > > --- > > v2: > > - New patch in v2 to fix the only other user of struct > dwapb_port_property. > > Thanks for your patch! > > To avoid bisection compile failures due to the changed type of > dwapb_port_property.irq, I think this should be folded into the first patch, Right, thanks for pointing this out! Phil > > --- > > drivers/mfd/intel_quark_i2c_gpio.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mfd/intel_quark_i2c_gpio.c > > b/drivers/mfd/intel_quark_i2c_gpio.c > > index 90e35de..5bddb84 100644 > > --- a/drivers/mfd/intel_quark_i2c_gpio.c > > +++ b/drivers/mfd/intel_quark_i2c_gpio.c > > @@ -233,7 +233,8 @@ static int intel_quark_gpio_setup(struct pci_dev > *pdev, struct mfd_cell *cell) > > pdata->properties->idx = 0; > > pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; > > pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE; > > - pdata->properties->irq = pdev->irq; > > + pdata->properties->irq[0] = pdev->irq; > > + pdata->properties->has_irq = true; > > pdata->properties->irq_shared = true; > > > > cell->platform_data = pdata; > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux- > m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c index 90e35de..5bddb84 100644 --- a/drivers/mfd/intel_quark_i2c_gpio.c +++ b/drivers/mfd/intel_quark_i2c_gpio.c @@ -233,7 +233,8 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell) pdata->properties->idx = 0; pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE; - pdata->properties->irq = pdev->irq; + pdata->properties->irq[0] = pdev->irq; + pdata->properties->has_irq = true; pdata->properties->irq_shared = true; cell->platform_data = pdata;
Since the way the Synopsys GPIO interrupts are stored has changed, this driver needs to be updated in line with the changes. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> --- v2: - New patch in v2 to fix the only other user of struct dwapb_port_property. --- drivers/mfd/intel_quark_i2c_gpio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)