brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 0011-bcm47xx-fix-irq-assignment-for-new-SoCs.patch

diff --git a/target/linux/brcm47xx/patches-3.0/0011-bcm47xx-fix-irq-assignment-for-new-SoCs.patch b/target/linux/brcm47xx/patches-3.0/0011-bcm47xx-fix-irq-assignment-for-new-SoCs.patch
new file mode 100644 (file)
index 0000000..f3229eb
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.0/0011-bcm47xx-fix-irq-assignment-for-new-SoCs.patch
@@ -0,0 +1,37 @@
+From a277b0b02837a167a5766c048dedef8dfc2fb707 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 6 Jun 2011 00:07:38 +0200
+Subject: [PATCH 11/22] bcm47xx: fix irq assignment for new SoCs.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/irq.c |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/bcm47xx/irq.c
++++ b/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_active_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();
+ }