Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpio: cadence: Pass irqchip when adding gpiochip

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: Jan Kotas <jank@cadence.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Jan Kotas <jank@cadence.com>
Link: https://lore.kernel.org/r/20190809131804.20352-1-linus.walleij@linaro.org

+23 -17
+23 -17
drivers/gpio/gpio-cadence.c
··· 214 214 goto err_revert_dir; 215 215 } 216 216 217 + /* 218 + * Optional irq_chip support 219 + */ 220 + irq = platform_get_irq(pdev, 0); 221 + if (irq >= 0) { 222 + struct gpio_irq_chip *girq; 223 + 224 + girq = &cgpio->gc.irq; 225 + girq->chip = &cdns_gpio_irqchip; 226 + girq->parent_handler = cdns_gpio_irq_handler; 227 + girq->num_parents = 1; 228 + girq->parents = devm_kcalloc(&pdev->dev, 1, 229 + sizeof(*girq->parents), 230 + GFP_KERNEL); 231 + if (!girq->parents) { 232 + ret = -ENOMEM; 233 + goto err_disable_clk; 234 + } 235 + girq->parents[0] = irq; 236 + girq->default_type = IRQ_TYPE_NONE; 237 + girq->handler = handle_level_irq; 238 + } 239 + 217 240 ret = devm_gpiochip_add_data(&pdev->dev, &cgpio->gc, cgpio); 218 241 if (ret < 0) { 219 242 dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); 220 243 goto err_disable_clk; 221 - } 222 - 223 - /* 224 - * irq_chip support 225 - */ 226 - irq = platform_get_irq(pdev, 0); 227 - if (irq >= 0) { 228 - ret = gpiochip_irqchip_add(&cgpio->gc, &cdns_gpio_irqchip, 229 - 0, handle_level_irq, 230 - IRQ_TYPE_NONE); 231 - if (ret) { 232 - dev_err(&pdev->dev, "Could not add irqchip, %d\n", 233 - ret); 234 - goto err_disable_clk; 235 - } 236 - gpiochip_set_chained_irqchip(&cgpio->gc, &cdns_gpio_irqchip, 237 - irq, cdns_gpio_irq_handler); 238 244 } 239 245 240 246 cgpio->bypass_orig = ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE);