[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1295338738-4129-1-git-send-email-s.neumann@raumfeld.com>
Date: Tue, 18 Jan 2011 09:18:58 +0100
From: Sven Neumann <s.neumann@...mfeld.com>
To: Lars-Peter Clausen <lars@...afoo.de>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Daniel Mack <daniel@...aq.de>, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
Lars-Peter Clausen <lars@...afoo.de>
Subject: [PATCH] pxa3xx: fix PXA GPIO IRQ handling
From: Lars-Peter Clausen <lars@...afoo.de>
Set the "set_wake" field of the irq_chip struct before calling
set_irq_chip() for all of the IRQs, so that the compat handler
actually gets installed.
Tested-by: Sven Neumann <s.neumann@...mfeld.com>
---
arch/arm/mach-pxa/irq.c | 7 ++++---
arch/arm/mach-pxa/pxa3xx.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 1beb40f..a5b42a7 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -111,13 +111,13 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn)
GRER0 &= ~0x3;
GEDR0 = 0x3;
+ pxa_low_gpio_chip.set_wake = fn;
+
for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
set_irq_chip(irq, &pxa_low_gpio_chip);
set_irq_handler(irq, handle_edge_irq);
set_irq_flags(irq, IRQF_VALID);
}
-
- pxa_low_gpio_chip.set_wake = fn;
}
void __init pxa_init_irq(int irq_nr, set_wake_t fn)
@@ -142,13 +142,14 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
/* only unmasked interrupts kick us out of idle */
ICCR = 1;
+ pxa_internal_irq_chip.set_wake = fn;
+
for (irq = PXA_IRQ(0); irq < PXA_IRQ(irq_nr); irq++) {
set_irq_chip(irq, &pxa_internal_irq_chip);
set_irq_handler(irq, handle_level_irq);
set_irq_flags(irq, IRQF_VALID);
}
- pxa_internal_irq_chip.set_wake = fn;
pxa_init_low_gpio_irq(fn);
}
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 276e8fb..5a8fe5c 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -567,13 +567,13 @@ static void __init pxa_init_ext_wakeup_irq(set_wake_t fn)
{
int irq;
+ pxa_ext_wakeup_chip.set_wake = fn;
+
for (irq = IRQ_WAKEUP0; irq <= IRQ_WAKEUP1; irq++) {
set_irq_chip(irq, &pxa_ext_wakeup_chip);
set_irq_handler(irq, handle_edge_irq);
set_irq_flags(irq, IRQF_VALID);
}
-
- pxa_ext_wakeup_chip.set_wake = fn;
}
void __init pxa3xx_init_irq(void)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists