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

Commit 6054b9ca authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl/nomadik: use simple or linear IRQ domain 



This alters the Nomadik pinctrl driver to:

- Call irqdomain_add_linear() for the DT case so we get
  all independent from IRQ numbers in this case.
- Call irqdomain_add_simple() for the legacy case, which
  allocates the IRQ descriptors for the Nomadik pin controller
  dynamically.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2854d167

drivers/pinctrl/pinctrl-nomadik.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -1371,9 +1371,19 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) 




	platform_set_drvdata(dev, nmk_chip);

	platform_set_drvdata(dev, nmk_chip);





	nmk_chip->domain = irq_domain_add_legacy(np, NMK_GPIO_PER_CHIP,

	if (np) {

						NOMADIK_GPIO_TO_IRQ(pdata->first_gpio),

		/* The DT case will just grab a set of IRQ numbers */

						0, &nmk_gpio_irq_simple_ops, nmk_chip);

		nmk_chip->domain = irq_domain_add_linear(np, NMK_GPIO_PER_CHIP,

				&nmk_gpio_irq_simple_ops, nmk_chip);

	} else {

		/* Non-DT legacy mode, use hardwired IRQ numbers */

		int irq_start;



		irq_start = NOMADIK_GPIO_TO_IRQ(pdata->first_gpio);

		nmk_chip->domain = irq_domain_add_simple(NULL,

				NMK_GPIO_PER_CHIP, irq_start,

				&nmk_gpio_irq_simple_ops, nmk_chip);

	}

	if (!nmk_chip->domain) {

	if (!nmk_chip->domain) {

		dev_err(&dev->dev, "failed to create irqdomain\n");

		dev_err(&dev->dev, "failed to create irqdomain\n");

		ret = -ENOSYS;

		ret = -ENOSYS;