diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 00:01:08 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 00:01:08 +0100 |
| commit | fa353e9f409340cefc7650854065cbcea85c347d (patch) | |
| tree | c98cc2835f8fd5f9b27a08ecc95afae8f38b3ec2 /arch/arm/mach-s5pv310/cpu.c | |
| parent | ARM: S5PV310: Universal SDHCI devices support (diff) | |
| parent | ARM: S5PV310: Add irq_mask to handle combiner irqs properly (diff) | |
| download | linux-fa353e9f409340cefc7650854065cbcea85c347d.tar.xz linux-fa353e9f409340cefc7650854065cbcea85c347d.zip | |
Merge branch 'dev/s5pv310-irq' into next-s5pv310
Diffstat (limited to 'arch/arm/mach-s5pv310/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c index 7b6e066e2271..9900464082db 100644 --- a/arch/arm/mach-s5pv310/cpu.c +++ b/arch/arm/mach-s5pv310/cpu.c @@ -132,6 +132,15 @@ void __init s5pv310_init_irq(void) gic_cpu_init(0, S5P_VA_GIC_CPU); for (irq = 0; irq < MAX_COMBINER_NR; irq++) { + + /* + * From SPI(0) to SPI(39) and SPI(51), SPI(53) are + * connected to the interrupt combiner. These irqs + * should be initialized to support cascade interrupt. + */ + if ((irq >= 40) && !(irq == 51) && !(irq == 53)) + continue; + combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq), COMBINER_IRQ(irq, 0)); combiner_cascade_irq(irq, IRQ_SPI(irq)); |