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

gpio: mt7621: 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.

This driver requests the IRQ directly in the driver so it
differs a bit from the others.

Cc: Greg Ungerer <gerg@kernel.org>
Cc: Nicholas Mc Guire <hofrat@osadl.org>
Cc: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarRené van Dorst <opensource@vdorst.com>
Link: https://lore.kernel.org/r/20190809141116.16403-1-linus.walleij@linaro.org
parent b1d64c71

drivers/gpio/gpio-mt7621.c

+17 −16
Original line number Diff line number Diff line
@@ -241,13 +241,6 @@ mediatek_gpio_bank_probe(struct device *dev, 
	if (!rg->chip.label)

		return -ENOMEM;



	ret = devm_gpiochip_add_data(dev, &rg->chip, mtk);

	if (ret < 0) {

		dev_err(dev, "Could not register gpio %d, ret=%d\n",

			rg->chip.ngpio, ret);

		return ret;

	}



	rg->irq_chip.name = dev_name(dev);

	rg->irq_chip.parent_device = dev;

	rg->irq_chip.irq_unmask = mediatek_gpio_irq_unmask;
@@ -256,8 +249,10 @@ mediatek_gpio_bank_probe(struct device *dev, 
	rg->irq_chip.irq_set_type = mediatek_gpio_irq_type;



	if (mtk->gpio_irq) {

		struct gpio_irq_chip *girq;



		/*

		 * Manually request the irq here instead of passing

		 * Directly request the irq here instead of passing

		 * a flow-handler to gpiochip_set_chained_irqchip,

		 * because the irq is shared.

		 */
@@ -271,15 +266,21 @@ mediatek_gpio_bank_probe(struct device *dev, 
			return ret;

		}



		ret = gpiochip_irqchip_add(&rg->chip, &rg->irq_chip,

					   0, handle_simple_irq, IRQ_TYPE_NONE);

		if (ret) {

			dev_err(dev, "failed to add gpiochip_irqchip\n");

			return ret;

		girq = &rg->chip.irq;

		girq->chip = &rg->irq_chip;

		/* This will let us handle the parent IRQ in the driver */

		girq->parent_handler = NULL;

		girq->num_parents = 0;

		girq->parents = NULL;

		girq->default_type = IRQ_TYPE_NONE;

		girq->handler = handle_simple_irq;

	}



		gpiochip_set_chained_irqchip(&rg->chip, &rg->irq_chip,

					     mtk->gpio_irq, NULL);

	ret = devm_gpiochip_add_data(dev, &rg->chip, mtk);

	if (ret < 0) {

		dev_err(dev, "Could not register gpio %d, ret=%d\n",

			rg->chip.ngpio, ret);

		return ret;

	}



	/* set polarity to low for all gpios */

CRA Git | Maintained and supported by SUSTech CRA and CCSE