Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:53547 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445Ab1GVXVH (ORCPT ); Fri, 22 Jul 2011 19:21:07 -0400 From: Hauke Mehrtens To: linville@tuxdriver.com, linux-wireless@vger.kernel.org, linux-mips@linux-mips.org Cc: jonas.gorski@gmail.com, ralf@linux-mips.org, zajec5@gmail.com, mb@bu3sch.de, george@znau.edu.ua, arend@broadcom.com, b43-dev@lists.infradead.org, bernhardloos@googlemail.com, arnd@arndb.de, julian.calaby@gmail.com, sshtylyov@mvista.com, Hauke Mehrtens Subject: [PATCH 11/11] bcm47xx: fix irq assignment for new SoCs. Date: Sat, 23 Jul 2011 01:20:15 +0200 Message-Id: <1311376815-15755-12-git-send-email-hauke@hauke-m.de> (sfid-20110723_012125_712111_4EDFEFAE) In-Reply-To: <1311376815-15755-1-git-send-email-hauke@hauke-m.de> References: <1311376815-15755-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 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c index 325757a..8cf3833 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,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(); } -- 1.7.4.1