pinctrl: ocelot: Always register GPIO driver (550713e3) · Commits · 戴 / test

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>

drivers/pinctrl/pinctrl-ocelot.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -751,21 +751,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;

		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),
		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)

Admin message