| Message ID | 20191105203557.78562-6-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpiolib: fix GPIO <-> pin mapping registration | expand |
On Tue, Nov 05, 2019 at 10:35:55PM +0200, Andy Shevchenko 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. > > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Tiny nit below. > Cc: David Cohen <david.a.cohen@linux.intel.com> > Cc: Thierry Reding <treding@nvidia.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-merrifield.c | 33 ++++++++++++++++++++------------- > 1 file changed, 20 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c > index e96d8e517e26..60d6ad012881 100644 > --- a/drivers/gpio/gpio-merrifield.c > +++ b/drivers/gpio/gpio-merrifield.c > @@ -362,8 +362,9 @@ static void mrfld_irq_handler(struct irq_desc *desc) > chained_irq_exit(irqchip, desc); > } > > -static void mrfld_irq_init_hw(struct mrfld_gpio *priv) > +static int mrfld_irq_init_hw(struct gpio_chip *chip) > { > + struct mrfld_gpio *priv = gpiochip_get_data(chip); > void __iomem *reg; > unsigned int base; > > @@ -375,6 +376,8 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv) > reg = gpio_reg(&priv->chip, base, GFER); > writel(0, reg); > } > + > + return 0; > } > > static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv) > @@ -420,6 +423,7 @@ static int mrfld_gpio_add_pin_ranges(struct gpio_chip *chip) > > static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id) > { > + struct gpio_irq_chip *girq; > struct mrfld_gpio *priv; > u32 gpio_base, irq_base; > void __iomem *base; > @@ -467,24 +471,27 @@ 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->init_hw = mrfld_irq_init_hw; > + girq->parent_handler = mrfld_irq_handler; > + girq->num_parents = 1; > + girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents, > + sizeof(*girq->parents), > + GFP_KERNEL); Maybe write it using only two lines: girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents, sizeof(*girq->parents), GFP_KERNEL); > + if (!girq->parents) > + return -ENOMEM; > + girq->parents[0] = pdev->irq; > + girq->first = irq_base; > + girq->default_type = IRQ_TYPE_NONE; > + girq->handler = handle_bad_irq; > + > retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv); > if (retval) { > dev_err(&pdev->dev, "gpiochip_add error %d\n", retval); > return retval; > } > > - 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); > - > pci_set_drvdata(pdev, priv); > return 0; > } > -- > 2.24.0.rc1
diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index e96d8e517e26..60d6ad012881 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -362,8 +362,9 @@ static void mrfld_irq_handler(struct irq_desc *desc) chained_irq_exit(irqchip, desc); } -static void mrfld_irq_init_hw(struct mrfld_gpio *priv) +static int mrfld_irq_init_hw(struct gpio_chip *chip) { + struct mrfld_gpio *priv = gpiochip_get_data(chip); void __iomem *reg; unsigned int base; @@ -375,6 +376,8 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv) reg = gpio_reg(&priv->chip, base, GFER); writel(0, reg); } + + return 0; } static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv) @@ -420,6 +423,7 @@ static int mrfld_gpio_add_pin_ranges(struct gpio_chip *chip) static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id) { + struct gpio_irq_chip *girq; struct mrfld_gpio *priv; u32 gpio_base, irq_base; void __iomem *base; @@ -467,24 +471,27 @@ 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->init_hw = mrfld_irq_init_hw; + girq->parent_handler = mrfld_irq_handler; + girq->num_parents = 1; + girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents, + sizeof(*girq->parents), + GFP_KERNEL); + if (!girq->parents) + return -ENOMEM; + girq->parents[0] = pdev->irq; + girq->first = irq_base; + girq->default_type = IRQ_TYPE_NONE; + girq->handler = handle_bad_irq; + retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv); if (retval) { dev_err(&pdev->dev, "gpiochip_add error %d\n", retval); return retval; } - 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); - pci_set_drvdata(pdev, priv); return 0; }