Commit 1f0529b4 authored by Linus Walleij's avatar Linus Walleij Committed by Samuel Ortiz

mfd: tc3589x: Use simple irqdomain

This fixes a regression in the TC3589x driver introduced in
commit 15e27b10
"mfd: Provide the tc3589x with its own IRQ domain"

If a system with a TC3589x expander is booted and a base
IRQ is passed from platform data, a legacy domain will
be used. However, since the Ux500 is now switched to use
SPARSE_IRQ, no descriptors get allocated on-the-fly,
and we get a crash.

Fix this by switching to using the simple irqdomain that
will handle this uniformly and also allocates descriptors
explicitly.

Also fix two small whitespace errors in the vicinity while
we're at it.

Cc: stable@kernel.org
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b30dd8f2
...@@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq) ...@@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq)
} }
static struct irq_domain_ops tc3589x_irq_ops = { static struct irq_domain_ops tc3589x_irq_ops = {
.map = tc3589x_irq_map, .map = tc3589x_irq_map,
.unmap = tc3589x_irq_unmap, .unmap = tc3589x_irq_unmap,
.xlate = irq_domain_xlate_twocell, .xlate = irq_domain_xlate_twocell,
}; };
static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np) static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np)
{ {
int base = tc3589x->irq_base; int base = tc3589x->irq_base;
if (base) { tc3589x->domain = irq_domain_add_simple(
tc3589x->domain = irq_domain_add_legacy( np, TC3589x_NR_INTERNAL_IRQS, base,
NULL, TC3589x_NR_INTERNAL_IRQS, base, &tc3589x_irq_ops, tc3589x);
0, &tc3589x_irq_ops, tc3589x);
}
else {
tc3589x->domain = irq_domain_add_linear(
np, TC3589x_NR_INTERNAL_IRQS,
&tc3589x_irq_ops, tc3589x);
}
if (!tc3589x->domain) { if (!tc3589x->domain) {
dev_err(tc3589x->dev, "Failed to create irqdomain\n"); dev_err(tc3589x->dev, "Failed to create irqdomain\n");
......
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