aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEunbong Song <eunb.song@samsung.com>2014-04-22 02:16:15 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-06-04 16:50:42 -0400
commita53825ef4e9b2f42a21ad2b903f4d0ce691a5d63 (patch)
treeed8e14f786cb1442bd454baa34207715acdb12f7
parentfd28b9ac8e8944b04ace0fceb7222edd4e42b00a (diff)
MIPS: Octeon: Add twsi interrupt initialization for OCTEON 3XXX, 5XXX, 63XX
In octeon_3xxx.dts file, there is a definiton for twsi/twsi2 interrupts. But there is no code for initialization of this interrupts. This patch adds code for initialization of twsi interrupts. Signed-off-by: Eunbong Song <eunb.song@samsung.com> Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6816/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cavium-octeon/octeon-irq.c2
-rw-r--r--arch/mips/include/asm/mach-cavium-octeon/irq.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 3aa5b46b2d40..1b82ac6921e0 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1260,11 +1260,13 @@ static void __init octeon_irq_init_ciu(void)
1260 for (i = 0; i < 4; i++) 1260 for (i = 0; i < 4; i++)
1261 octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_MSI0, 0, i + 40); 1261 octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_MSI0, 0, i + 40);
1262 1262
1263 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI, 0, 45);
1263 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_RML, 0, 46); 1264 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_RML, 0, 46);
1264 for (i = 0; i < 4; i++) 1265 for (i = 0; i < 4; i++)
1265 octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_TIMER0, 0, i + 52); 1266 octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_TIMER0, 0, i + 52);
1266 1267
1267 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56); 1268 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);
1269 octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59);
1268 1270
1269 /* CIU_1 */ 1271 /* CIU_1 */
1270 for (i = 0; i < 16; i++) 1272 for (i = 0; i < 16; i++)
diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/include/asm/mach-cavium-octeon/irq.h
index 60fc4c347c44..cceae32a0732 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/irq.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h
@@ -35,6 +35,8 @@ enum octeon_irq {
35 OCTEON_IRQ_PCI_MSI2, 35 OCTEON_IRQ_PCI_MSI2,
36 OCTEON_IRQ_PCI_MSI3, 36 OCTEON_IRQ_PCI_MSI3,
37 37
38 OCTEON_IRQ_TWSI,
39 OCTEON_IRQ_TWSI2,
38 OCTEON_IRQ_RML, 40 OCTEON_IRQ_RML,
39 OCTEON_IRQ_TIMER0, 41 OCTEON_IRQ_TIMER0,
40 OCTEON_IRQ_TIMER1, 42 OCTEON_IRQ_TIMER1,