lpc32xx: irq - Set the chain handlers after setting up the IRQ domain

PATCH New Alban Bedel 2 participants 4 messages Nov 1, 2012 – Nov 5, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/LPC32XX SoC support

lore

Share & tools

lore

Alban Bedel

author

2012-11-01 12:23 UTC #0 lore raw

PATCH 1/1 lpc32xx: irq - Set the chain handlers after setting up the IRQ domain

Signed-off-by Alban Bedel <[email protected]>

---
 arch/arm/mach-lpc32xx/irq.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

arch/arm/mach-lpc32xx/irq.c +7 -5

index 3c63327..b92dc25 100644
@@ -448,10 +448,6 @@ void __init lpc32xx_init_irq(void)
 	__raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC1_BASE));
 	__raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC2_BASE));
 
-	/* MIC SUBIRQx interrupts will route handling to the chain handlers */
-	irq_set_chained_handler(IRQ_LPC32XX_SUB1IRQ, lpc32xx_sic1_handler);
-	irq_set_chained_handler(IRQ_LPC32XX_SUB2IRQ, lpc32xx_sic2_handler);
-
 	/* Initially disable all wake events */
 	__raw_writel(0, LPC32XX_CLKPWR_P01_ER);
 	__raw_writel(0, LPC32XX_CLKPWR_INT_ER);

@@ -485,6 +481,12 @@ void __init lpc32xx_init_irq(void)
 						   irq_base, 0,
 						   &irq_domain_simple_ops,
 						   NULL);
-	if (!lpc32xx_mic_domain)
+	if (!lpc32xx_mic_domain) {
 		panic("Unable to add MIC irq domain\n");
+		return;
+	}
+
+	/* MIC SUBIRQx interrupts will route handling to the chain handlers */
+	irq_set_chained_handler(IRQ_LPC32XX_SUB1IRQ, lpc32xx_sic1_handler);
+	irq_set_chained_handler(IRQ_LPC32XX_SUB2IRQ, lpc32xx_sic2_handler);
 }

Signature · 1 line

1.7.0.4

I already posted basically the same change on 2012-10-28 already which is part of my patch set for LPC32xx to be merged into arm-soc.git (will do a pull request later). Fixing another irq bug in this platform/irq also.

Please also note that panic() doesn't return, so I won't include the respective new return that you added.

Thanks,

Roland

Alban Bedel

author

2012-11-05 17:00 UTC #2 lore raw

PATCH 1/1 lpc32xx: irq - Set the chain handlers after setting up the IRQ domain

Quoted 5 lines · On Fri, 02 Nov 2012 10:01:49 +0100 Roland Stigge <[email protected]> wrote:

Thanks for your patch!
I already posted basically the same change on 2012-10-28 already which is part of my patch set for LPC32xx to be merged into arm-soc.git (will do a pull request later). Fixing another irq bug in this platform/irq also.

I checked arm-soc.git, linux-next.git, linux-arm-kernel@ and linux-kernel@, is there any other place I should check before submitting LPC32xx patches?

Quoted 2 lines

Please also note that panic() doesn't return, so I won't include the respective new return that you added.

Alban

Roland Stigge

2012-11-05 17:35 UTC #3 lore raw

PATCH 1/1 lpc32xx: irq - Set the chain handlers after setting up the IRQ domain

Hi!

Quoted 7 lines · Alban Bedel

Quoted 3 lines
I already posted basically the same change on 2012-10-28 already which is part of my patch set for LPC32xx to be merged into arm-soc.git (will do a pull request later). Fixing another irq bug in this platform/irq also.
I checked arm-soc.git, linux-next.git, linux-arm-kernel@ and linux-kernel@, is there any other place I should check before submitting LPC32xx patches?

I usually prepare lpc32xx branches for merging into arm-soc.git at git.antcom.de. Expect the posted patches there and a pull request during the next days.

Thanks,

Roland