diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
commit | 4ee1d48f495829f9153bf6dae93fe090befe591c (patch) | |
tree | d0486f6bcb4c6cac1c25d4787ca13885ef6bd7ad /target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch | |
parent | c818073c4a312dc687e49a4981e013bff40b38d3 (diff) | |
download | upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.gz upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.bz2 upstream-4ee1d48f495829f9153bf6dae93fe090befe591c.zip |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch b/target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch deleted file mode 100644 index a40e726956..0000000000 --- a/target/linux/brcm47xx/patches-3.0/0013-bcm47xx-fix-irq-assignment-for-new-SoCs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 360eb82fd303ac24590a1b99ad1866162f6b0171 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 13/14] 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(); - } |