| Message ID | 20190812082331.22674-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 8f86a5b4ad679e4836733b47414226074eee4e4d |
| Headers | show |
| Series | gpio: merrifield: Pass irqchip when adding gpiochip | expand |
On Mon, Aug 12, 2019 at 10:23:31AM +0200, Linus Walleij wrote: > We need to convert all old gpio irqchips to pass the irqchip > setup along when adding the gpio_chip. For more info see > drivers/gpio/TODO. > > For chained irqchips this is a pretty straight-forward > conversion. > Same comment as per lynxpoint patch. -- With Best Regards, Andy Shevchenko
On Mon, Aug 12, 2019 at 10:23:31AM +0200, Linus Walleij wrote: > We need to convert all old gpio irqchips to pass the irqchip > setup along when adding the gpio_chip. For more info see > drivers/gpio/TODO. > > For chained irqchips this is a pretty straight-forward > conversion. All three Intel GPIO changes with kcalloc() fix I was commenting about pushed to my review and testing queue. Thanks! > > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > Cc: David Cohen <david.a.cohen@linux.intel.com> > Cc: Thierry Reding <treding@nvidia.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > Andy: when you're happy with this you can either supply an > ACK and I will merge it or you can merge it into your tree > for a later pull request, just tell me what you prefer. > --- > drivers/gpio/gpio-merrifield.c | 28 ++++++++++++++++------------ > 1 file changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c > index 3302125e5265..299277951791 100644 > --- a/drivers/gpio/gpio-merrifield.c > +++ b/drivers/gpio/gpio-merrifield.c > @@ -397,6 +397,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id > { > const struct mrfld_gpio_pinrange *range; > const char *pinctrl_dev_name; > + struct gpio_irq_chip *girq; > struct mrfld_gpio *priv; > u32 gpio_base, irq_base; > void __iomem *base; > @@ -444,6 +445,21 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id > > raw_spin_lock_init(&priv->lock); > > + girq = &priv->chip.irq; > + girq->chip = &mrfld_irqchip; > + girq->parent_handler = mrfld_irq_handler; > + girq->num_parents = 1; > + girq->parents = devm_kcalloc(&pdev->dev, 1, > + sizeof(*girq->parents), > + GFP_KERNEL); > + if (!girq->parents) > + return -ENOMEM; > + girq->parents[0] = pdev->irq; > + girq->default_type = IRQ_TYPE_NONE; > + girq->handler = handle_bad_irq; > + > + mrfld_irq_init_hw(priv); > + > pci_set_drvdata(pdev, priv); > retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv); > if (retval) { > @@ -465,18 +481,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id > } > } > > - retval = gpiochip_irqchip_add(&priv->chip, &mrfld_irqchip, irq_base, > - handle_bad_irq, IRQ_TYPE_NONE); > - if (retval) { > - dev_err(&pdev->dev, "could not connect irqchip to gpiochip\n"); > - return retval; > - } > - > - mrfld_irq_init_hw(priv); > - > - gpiochip_set_chained_irqchip(&priv->chip, &mrfld_irqchip, pdev->irq, > - mrfld_irq_handler); > - > return 0; > } > > -- > 2.21.0 > -- With Best Regards, Andy Shevchenko
diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index 3302125e5265..299277951791 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -397,6 +397,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id { const struct mrfld_gpio_pinrange *range; const char *pinctrl_dev_name; + struct gpio_irq_chip *girq; struct mrfld_gpio *priv; u32 gpio_base, irq_base; void __iomem *base; @@ -444,6 +445,21 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id raw_spin_lock_init(&priv->lock); + girq = &priv->chip.irq; + girq->chip = &mrfld_irqchip; + girq->parent_handler = mrfld_irq_handler; + girq->num_parents = 1; + girq->parents = devm_kcalloc(&pdev->dev, 1, + sizeof(*girq->parents), + GFP_KERNEL); + if (!girq->parents) + return -ENOMEM; + girq->parents[0] = pdev->irq; + girq->default_type = IRQ_TYPE_NONE; + girq->handler = handle_bad_irq; + + mrfld_irq_init_hw(priv); + pci_set_drvdata(pdev, priv); retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv); if (retval) { @@ -465,18 +481,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id } } - retval = gpiochip_irqchip_add(&priv->chip, &mrfld_irqchip, irq_base, - handle_bad_irq, IRQ_TYPE_NONE); - if (retval) { - dev_err(&pdev->dev, "could not connect irqchip to gpiochip\n"); - return retval; - } - - mrfld_irq_init_hw(priv); - - gpiochip_set_chained_irqchip(&priv->chip, &mrfld_irqchip, pdev->irq, - mrfld_irq_handler); - return 0; }
We need to convert all old gpio irqchips to pass the irqchip setup along when adding the gpio_chip. For more info see drivers/gpio/TODO. For chained irqchips this is a pretty straight-forward conversion. Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: David Cohen <david.a.cohen@linux.intel.com> Cc: Thierry Reding <treding@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Andy: when you're happy with this you can either supply an ACK and I will merge it or you can merge it into your tree for a later pull request, just tell me what you prefer. --- drivers/gpio/gpio-merrifield.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) -- 2.21.0