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

Commit 2519f9ab authored by David Cohen's avatar David Cohen Committed by Linus Walleij
Browse files

gpio-langwell: fix irq conflicts when DT is not used 



When DT is not used IOAPIC does not register irq domain. As result
IOAPIC won't care about gpio-langwell's virq and may cause conflict if
an irq number is equal to gpio-langwell's virq mapped beforehand.

This patch tells gpio_langwell to not ignore irq_base if != 0 and
preferably use it to avoid the conflict.

If DT is used, irq_base can safely be 0.

Signed-off-by: default avatarDavid Cohen <david.a.cohen@intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0f119a84

drivers/gpio/gpio-langwell.c

+10 −7
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static int lnw_gpio_probe(struct pci_dev *pdev, 
	resource_size_t start, len;

	struct lnw_gpio *lnw;

	u32 gpio_base;

	u32 irq_base;

	int retval;

	int ngpio = id->driver_data;
@@ -345,6 +346,7 @@ static int lnw_gpio_probe(struct pci_dev *pdev, 
		retval = -EFAULT;

		goto err_ioremap;

	}

	irq_base = *(u32 *)base;

	gpio_base = *((u32 *)base + 1);

	/* release the IO mapping, since we already get the info from bar1 */

	iounmap(base);
@@ -365,13 +367,6 @@ static int lnw_gpio_probe(struct pci_dev *pdev, 
		goto err_ioremap;

	}



	lnw->domain = irq_domain_add_linear(pdev->dev.of_node, ngpio,

					    &lnw_gpio_irq_ops, lnw);

	if (!lnw->domain) {

		retval = -ENOMEM;

		goto err_ioremap;

	}



	lnw->reg_base = base;

	lnw->chip.label = dev_name(&pdev->dev);

	lnw->chip.request = lnw_gpio_request;
@@ -384,6 +379,14 @@ static int lnw_gpio_probe(struct pci_dev *pdev, 
	lnw->chip.ngpio = ngpio;

	lnw->chip.can_sleep = 0;

	lnw->pdev = pdev;



	lnw->domain = irq_domain_add_simple(pdev->dev.of_node, ngpio, irq_base,

					    &lnw_gpio_irq_ops, lnw);

	if (!lnw->domain) {

		retval = -ENOMEM;

		goto err_ioremap;

	}



	pci_set_drvdata(pdev, lnw);

	retval = gpiochip_add(&lnw->chip);

	if (retval) {