Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607a0dcd authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: cadence: 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: Jan Kotas <jank@cadence.com>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarJan Kotas <jank@cadence.com>
Link: https://lore.kernel.org/r/20190809131804.20352-1-linus.walleij@linaro.org
parent a7fc89f9

drivers/gpio/gpio-cadence.c

+21 −15
Original line number Diff line number Diff line
@@ -214,27 +214,33 @@ static int cdns_gpio_probe(struct platform_device *pdev) 
		goto err_revert_dir;

	}



	ret = devm_gpiochip_add_data(&pdev->dev, &cgpio->gc, cgpio);

	if (ret < 0) {

		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);

		goto err_disable_clk;

	}



	/*

	 * irq_chip support

	 * Optional irq_chip support

	 */

	irq = platform_get_irq(pdev, 0);

	if (irq >= 0) {

		ret = gpiochip_irqchip_add(&cgpio->gc, &cdns_gpio_irqchip,

					   0, handle_level_irq,

					   IRQ_TYPE_NONE);

		if (ret) {

			dev_err(&pdev->dev, "Could not add irqchip, %d\n",

				ret);

		struct gpio_irq_chip *girq;



		girq = &cgpio->gc.irq;

		girq->chip = &cdns_gpio_irqchip;

		girq->parent_handler = cdns_gpio_irq_handler;

		girq->num_parents = 1;

		girq->parents = devm_kcalloc(&pdev->dev, 1,

					     sizeof(*girq->parents),

					     GFP_KERNEL);

		if (!girq->parents) {

			ret = -ENOMEM;

			goto err_disable_clk;

		}

		gpiochip_set_chained_irqchip(&cgpio->gc, &cdns_gpio_irqchip,

					     irq, cdns_gpio_irq_handler);

		girq->parents[0] = irq;

		girq->default_type = IRQ_TYPE_NONE;

		girq->handler = handle_level_irq;

	}



	ret = devm_gpiochip_add_data(&pdev->dev, &cgpio->gc, cgpio);

	if (ret < 0) {

		dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);

		goto err_disable_clk;

	}



	cgpio->bypass_orig = ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE);