Messages in this thread Patch in this message | | | From | Robert Jarzmik <> | Subject | [PATCH] ARM: pxa: fix lubbock interrupts handling | Date | Thu, 27 Nov 2014 19:42:01 +0100 |
| |
When gpio-pxa was moved to drivers/pxa, it became a driver, and its initialization and probing happen at postcore initcall. The lubbock code used to install the chained lubbock interrupt handler at init_irq() time.
The consequence of the gpio-pxa change is that the installed chained irq handler lubbock_irq_handler() was overwritten in pxa_gpio_probe(_dt)(), removing : - the handler - the falling edge detection setting of GPIO0, which revealed the interrupt request from the lubbock IO board.
As a fix, move the gpio0 chained handler setup to a place where we have the guarantee that pxa_gpio_probe() was called before, so that lubbock handler becomes the true IRQ chained handler of GPIO0, demuxing the lubbock IO board interrupts.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- For Thomas: as a side note, I'm not very happy with this patch. What makes me unhappy is that I don't know how to express the dependency between gpio-pxa probe time and irq_set_chained_handler(irq, lubbock_irq_handler).
At the moment I rely on the fact that lubbock_irq_device_init() is called as device initcall while pxa_gpio_probe() is called as postcore initcall.
If you have a better idea I'm all ears. --- arch/arm/mach-pxa/lubbock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index d8a1be6..1f138f9 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c @@ -172,9 +172,6 @@ static void __init lubbock_init_irq(void) handle_level_irq); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } - - irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lubbock_irq_handler); - irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING); } #ifdef CONFIG_PM @@ -190,7 +187,13 @@ static struct syscore_ops lubbock_irq_syscore_ops = { static int __init lubbock_irq_device_init(void) { + int irq; + if (machine_is_lubbock()) { + irq = PXA_GPIO_TO_IRQ(0); + irq_set_chained_handler(irq, lubbock_irq_handler); + irq_set_irq_type(irq, IRQ_TYPE_EDGE_FALLING); + register_syscore_ops(&lubbock_irq_syscore_ops); return 0; } -- 2.1.0
| |