---

yaml
---
r: 265383
b: refs/heads/master
c: a3e72cd
h: refs/heads/master
i:
  265381: e271775
  265379: 9c67224
  265375: eab8296
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d1c5d4213ee96e054c4d195117368972a4c01f
+refs/heads/master: a3e72cd2974a4b178d4edf6737ae51d1ea83b5d8

trunk/arch/mips/bcm47xx/irq.c

@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <asm/irq_cpu.h>
+#include <bcm47xx.h>
 
 void plat_irq_dispatch(void)
 {
@@ -51,5 +52,16 @@ void plat_irq_dispatch(void)
 
 void __init arch_init_irq(void)
 {
+#ifdef CONFIG_BCM47XX_BCMA
+	if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) {
+		bcma_write32(bcm47xx_bus.bcma.bus.drv_mips.core,
+			     BCMA_MIPS_MIPS74K_INTMASK(5), 1 << 31);
+		/*
+		 * the kernel reads the timer irq from some register and thinks
+		 * it's #5, but we offset it by 2 and route to #7
+		 */
+		cp0_compare_irq = 7;
+	}
+#endif
 	mips_cpu_irq_init();
 }