Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:33116 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756371Ab1FEWIm (ORCPT ); Sun, 5 Jun 2011 18:08:42 -0400 From: Hauke Mehrtens To: linux-wireless@vger.kernel.org, linux-mips@linux-mips.org Cc: zajec5@gmail.com, mb@bu3sch.de, george@znau.edu.ua, arend@broadcom.com, b43-dev@lists.infradead.org, bernhardloos@googlemail.com, Hauke Mehrtens Subject: [RFC][PATCH 10/10] bcm47xx: fix irq assignment for new SoCs. Date: Mon, 6 Jun 2011 00:07:38 +0200 Message-Id: <1307311658-15853-11-git-send-email-hauke@hauke-m.de> (sfid-20110606_000846_419783_B3913879) In-Reply-To: <1307311658-15853-1-git-send-email-hauke@hauke-m.de> References: <1307311658-15853-1-git-send-email-hauke@hauke-m.de> Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Hauke Mehrtens --- 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 @@ -26,6 +26,7 @@ #include #include #include +#include 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(); } -- 1.7.4.1