pinctrl: ocelot: Fix interrupt parsing
authorHoratiu Vultur <horatiu.vultur@microchip.com>
Fri, 4 Mar 2022 14:44:32 +0000 (15:44 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 15 Mar 2022 00:52:33 +0000 (01:52 +0100)
In the blamed commit, it removes the duplicate of_node assignment in the
driver. But the driver uses this before calling into of_gpio_dev_init to
determine if it needs to assign an IRQ chip to the GPIO. The fixes
consists in using the platform_get_irq_optional

Fixes: 8a8d6bbe1d3bc7 ("pinctrl: Get rid of duplicate of_node assignment in the drivers")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Link: https://lore.kernel.org/r/20220304144432.3397621-3-horatiu.vultur@microchip.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-ocelot.c

index 35b213d..003fb0e 100644 (file)
@@ -1851,8 +1851,8 @@ static int ocelot_gpiochip_register(struct platform_device *pdev,
        gc->base = -1;
        gc->label = "ocelot-gpio";
 
-       irq = irq_of_parse_and_map(gc->of_node, 0);
-       if (irq) {
+       irq = platform_get_irq_optional(pdev, 0);
+       if (irq > 0) {
                girq = &gc->irq;
                girq->chip = &ocelot_irqchip;
                girq->parent_handler = ocelot_irq_handler;