Commit b475764d authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: pistachio: 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: Andrew Bresticker <abrestic@chromium.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJames Hartley <james.hartley@sondrel.com>
Link: https://lore.kernel.org/r/20191001214536.18477-1-linus.walleij@linaro.org
parent 2851ef52

drivers/pinctrl/pinctrl-pistachio.c

+16 −10
Original line number Diff line number Diff line
@@ -1352,6 +1352,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl) 
	for (i = 0; i < pctl->nbanks; i++) {

		char child_name[sizeof("gpioXX")];

		struct device_node *child;

		struct gpio_irq_chip *girq;



		snprintf(child_name, sizeof(child_name), "gpio%d", i);

		child = of_get_child_by_name(node, child_name);
@@ -1383,23 +1384,28 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl) 


		bank->gpio_chip.parent = pctl->dev;

		bank->gpio_chip.of_node = child;

		ret = gpiochip_add_data(&bank->gpio_chip, bank);

		if (ret < 0) {

			dev_err(pctl->dev, "Failed to add GPIO chip %u: %d\n",

				i, ret);



		girq = &bank->gpio_chip.irq;

		girq->chip = &bank->irq_chip;

		girq->parent_handler = pistachio_gpio_irq_handler;

		girq->num_parents = 1;

		girq->parents = devm_kcalloc(pctl->dev, 1,

					     sizeof(*girq->parents),

					     GFP_KERNEL);

		if (!girq->parents) {

			ret = -ENOMEM;

			goto err;

		}

		girq->parents[0] = irq;

		girq->default_type = IRQ_TYPE_NONE;

		girq->handler = handle_level_irq;



		ret = gpiochip_irqchip_add(&bank->gpio_chip, &bank->irq_chip,

					   0, handle_level_irq, IRQ_TYPE_NONE);

		ret = gpiochip_add_data(&bank->gpio_chip, bank);

		if (ret < 0) {

			dev_err(pctl->dev, "Failed to add IRQ chip %u: %d\n",

			dev_err(pctl->dev, "Failed to add GPIO chip %u: %d\n",

				i, ret);

			gpiochip_remove(&bank->gpio_chip);

			goto err;

		}

		gpiochip_set_chained_irqchip(&bank->gpio_chip, &bank->irq_chip,

					     irq, pistachio_gpio_irq_handler);



		ret = gpiochip_add_pin_range(&bank->gpio_chip,

					     dev_name(pctl->dev), 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE