| Message ID | 1307311658-15853-11-git-send-email-hauke@hauke-m.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hello. On 06-06-2011 2:07, Hauke Mehrtens wrote: > Signed-off-by: Hauke Mehrtens<hauke@hauke-m.de> > --- > arch/mips/bcm47xx/irq.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c > index 325757a..3642cee 100644 > --- a/arch/mips/bcm47xx/irq.c > +++ b/arch/mips/bcm47xx/irq.c [...] > @@ -51,5 +52,12 @@ void plat_irq_dispatch(void) > > void __init arch_init_irq(void) > { > + if (bcm47xx_active_bus_type == BCM47XX_BUS_TYPE_BCMA) { > + bcma_write32(bcm47xx_bus.bcma.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 */ The preferred style for the multi-line comments is this: /* * bla * bla */ WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c index 325757a..3642cee 100644 --- 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,12 @@ void plat_irq_dispatch(void) void __init arch_init_irq(void) { + if (bcm47xx_active_bus_type == BCM47XX_BUS_TYPE_BCMA) { + bcma_write32(bcm47xx_bus.bcma.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; + } mips_cpu_irq_init(); }
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- arch/mips/bcm47xx/irq.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)