[PATCH 2/2] gpio: iproc-gpio: Handle interrupts for multiple instances
From: Srinath Mannam <hidden>
Date: 2019-08-29 04:52:50
Also in:
lkml
Subsystem:
pin control subsystem, the rest · Maintainers:
Linus Walleij, Linus Torvalds
From: Rayagonda Kokatanur <redacted>
When multiple instance of iproc-gpio chips are present, a fix up
message[1] is printed during the probe of second and later instances.
This issue is because driver sharing same irq_chip data structure
among multiple instances of driver.
Fix this by allocating irq_chip data structure per instance of
iproc-gpio.
[1] fix up message addressed by this patch
[ 7.862208] gpio gpiochip2: (689d0000.gpio): detected irqchip that
is shared with multiple gpiochips: please fix the driver.
Fixes: 616043d58a89 ("pinctrl: Rename gpio driver from cygnus to iproc")
Signed-off-by: Rayagonda Kokatanur <redacted>
---
drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
index 20b9864..8729f47 100644
--- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
+++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c@@ -114,6 +114,7 @@ struct iproc_gpio { raw_spinlock_t lock; + struct irq_chip irqchip; struct gpio_chip gc; unsigned num_banks;
@@ -302,14 +303,6 @@ static int iproc_gpio_irq_set_type(struct irq_data *d, unsigned int type) return 0; } -static struct irq_chip iproc_gpio_irq_chip = { - .name = "bcm-iproc-gpio", - .irq_ack = iproc_gpio_irq_ack, - .irq_mask = iproc_gpio_irq_mask, - .irq_unmask = iproc_gpio_irq_unmask, - .irq_set_type = iproc_gpio_irq_set_type, -}; - /* * Request the Iproc IOMUX pinmux controller to mux individual pins to GPIO */
@@ -875,14 +868,22 @@ static int iproc_gpio_probe(struct platform_device *pdev) /* optional GPIO interrupt support */ irq = platform_get_irq(pdev, 0); if (irq) { - ret = gpiochip_irqchip_add(gc, &iproc_gpio_irq_chip, 0, + chip->irqchip.name = "bcm-iproc-gpio"; + chip->irqchip.irq_ack = iproc_gpio_irq_ack; + chip->irqchip.irq_mask = iproc_gpio_irq_mask; + chip->irqchip.irq_unmask = iproc_gpio_irq_unmask; + chip->irqchip.irq_set_type = iproc_gpio_irq_set_type; + chip->irqchip.irq_enable = iproc_gpio_irq_unmask; + chip->irqchip.irq_disable = iproc_gpio_irq_mask; + + ret = gpiochip_irqchip_add(gc, &chip->irqchip, 0, handle_simple_irq, IRQ_TYPE_NONE); if (ret) { dev_err(dev, "no GPIO irqchip\n"); goto err_rm_gpiochip; } - gpiochip_set_chained_irqchip(gc, &iproc_gpio_irq_chip, irq, + gpiochip_set_chained_irqchip(gc, &chip->irqchip, irq, iproc_gpio_irq_handler); }
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel