Commit 9d373aca authored by Phil Reid's avatar Phil Reid Committed by Linus Walleij

gpio: altera: Allocate irq_chip dynamically

Keeping the irq_chip definition static shares it with multiple instances
of the altera gpiochip in the system. This is bad and now we get this
warning from gpiolib core:

"detected irqchip that is shared with multiple gpiochips: please fix the
driver."

Hence, move the irq_chip definition from being driver static into the
struct altera_gpio_chips. So a unique irq_chip is used for each gpiochip
instance.
Signed-off-by: default avatarPhil Reid <preid@electromag.com.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1ebd0687
...@@ -30,6 +30,7 @@ struct altera_gpio_chip { ...@@ -30,6 +30,7 @@ struct altera_gpio_chip {
raw_spinlock_t gpio_lock; raw_spinlock_t gpio_lock;
int interrupt_trigger; int interrupt_trigger;
int mapped_irq; int mapped_irq;
struct irq_chip irq_chip;
}; };
static void altera_gpio_irq_unmask(struct irq_data *d) static void altera_gpio_irq_unmask(struct irq_data *d)
...@@ -101,15 +102,6 @@ static unsigned int altera_gpio_irq_startup(struct irq_data *d) ...@@ -101,15 +102,6 @@ static unsigned int altera_gpio_irq_startup(struct irq_data *d)
return 0; return 0;
} }
static struct irq_chip altera_irq_chip = {
.name = "altera-gpio",
.irq_mask = altera_gpio_irq_mask,
.irq_unmask = altera_gpio_irq_unmask,
.irq_set_type = altera_gpio_irq_set_type,
.irq_startup = altera_gpio_irq_startup,
.irq_shutdown = altera_gpio_irq_mask,
};
static int altera_gpio_get(struct gpio_chip *gc, unsigned offset) static int altera_gpio_get(struct gpio_chip *gc, unsigned offset)
{ {
struct of_mm_gpio_chip *mm_gc; struct of_mm_gpio_chip *mm_gc;
...@@ -294,8 +286,15 @@ static int altera_gpio_probe(struct platform_device *pdev) ...@@ -294,8 +286,15 @@ static int altera_gpio_probe(struct platform_device *pdev)
} }
altera_gc->interrupt_trigger = reg; altera_gc->interrupt_trigger = reg;
ret = gpiochip_irqchip_add(&altera_gc->mmchip.gc, &altera_irq_chip, 0, altera_gc->irq_chip.name = "altera-gpio";
handle_bad_irq, IRQ_TYPE_NONE); altera_gc->irq_chip.irq_mask = altera_gpio_irq_mask;
altera_gc->irq_chip.irq_unmask = altera_gpio_irq_unmask;
altera_gc->irq_chip.irq_set_type = altera_gpio_irq_set_type;
altera_gc->irq_chip.irq_startup = altera_gpio_irq_startup;
altera_gc->irq_chip.irq_shutdown = altera_gpio_irq_mask;
ret = gpiochip_irqchip_add(&altera_gc->mmchip.gc, &altera_gc->irq_chip,
0, handle_bad_irq, IRQ_TYPE_NONE);
if (ret) { if (ret) {
dev_err(&pdev->dev, "could not add irqchip\n"); dev_err(&pdev->dev, "could not add irqchip\n");
...@@ -303,7 +302,7 @@ static int altera_gpio_probe(struct platform_device *pdev) ...@@ -303,7 +302,7 @@ static int altera_gpio_probe(struct platform_device *pdev)
} }
gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc, gpiochip_set_chained_irqchip(&altera_gc->mmchip.gc,
&altera_irq_chip, &altera_gc->irq_chip,
altera_gc->mapped_irq, altera_gc->mapped_irq,
altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH ? altera_gc->interrupt_trigger == IRQ_TYPE_LEVEL_HIGH ?
altera_gpio_irq_leveL_high_handler : altera_gpio_irq_leveL_high_handler :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment