pinctrl: ocelot: Always register GPIO driver

[ Upstream commit 550713e33f4338c8596776828a936fd1e3bf35de ]

This fixes the situation where the GPIO controller is not
used as an interrupt controller as well.

Previously, the driver would silently fail to register even the
GPIO's. With this change, the driver will only register as an
interrupt controller if a parent interrupt is provided.

Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Lars Povlsen <lars.povlsen@microchip.com>
Link: https://lore.kernel.org/r/20200513125532.24585-2-lars.povlsen@microchip.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
index 4b99922d6c7e7e4c83cdc1cd4d3997c8996e179f..b1bf46ec207fd499fdae91a0127492879f4a4f94 100644 (file)
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -752,21 +752,21 @@ static int ocelot_gpiochip_register(struct platform_device *pdev,
        gc->of_node = info->dev->of_node;
        gc->label = "ocelot-gpio";
 
-       irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
-       if (irq <= 0)
-               return irq;
-
-       girq = &gc->irq;
-       girq->chip = &ocelot_irqchip;
-       girq->parent_handler = ocelot_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] = irq;
-       girq->default_type = IRQ_TYPE_NONE;
-       girq->handler = handle_edge_irq;
+       irq = irq_of_parse_and_map(gc->of_node, 0);
+       if (irq) {
+               girq = &gc->irq;
+               girq->chip = &ocelot_irqchip;
+               girq->parent_handler = ocelot_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] = irq;
+               girq->default_type = IRQ_TYPE_NONE;
+               girq->handler = handle_edge_irq;
+       }
 
        ret = devm_gpiochip_add_data(&pdev->dev, gc, info);
        if (ret)