[PATCH] mfd: tc3589x: use simple irqdomain

From: Linus Walleij
Date: Wed Jan 02 2013 - 05:23:32 EST

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

If a system with a TC3589x expander is booted from device
tree, but a base IRQ is anyway passed from platform data,
a linear IRQ domain will be used, while a legacy domain is
actually desired.

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

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

Cc: stable@xxxxxxxxxx
Cc: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Hi Sam, this should go into the fixes for stable unless issues
are found, it fixes a regression for us.
drivers/mfd/tc3589x.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index a06d66b..ecc092c 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq)

static struct irq_domain_ops tc3589x_irq_ops = {
- .map = tc3589x_irq_map,
+ .map = tc3589x_irq_map,
.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)
int base = tc3589x->irq_base;

- if (base) {
- tc3589x->domain = irq_domain_add_legacy(
- 0, &tc3589x_irq_ops, tc3589x);
- }
- else {
- tc3589x->domain = irq_domain_add_linear(
- &tc3589x_irq_ops, tc3589x);
- }
+ tc3589x->domain = irq_domain_add_simple(
+ np, TC3589x_NR_INTERNAL_IRQS, base,
+ &tc3589x_irq_ops, tc3589x);

if (!tc3589x->domain) {
dev_err(tc3589x->dev, "Failed to create irqdomain\n");

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/