aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-12 15:00:01 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-12 15:00:01 +0000
commit2bf03f971d431ca9584f489fbc6dd949f29c1898 (patch)
tree6c87aea1eec02d5e8145d8c3219337cc2957a9e7 /target/linux
parent0f101497ac9ed6bd76f9855cc803bf8280d1e319 (diff)
downloadupstream-2bf03f971d431ca9584f489fbc6dd949f29c1898.tar.gz
upstream-2bf03f971d431ca9584f489fbc6dd949f29c1898.tar.bz2
upstream-2bf03f971d431ca9584f489fbc6dd949f29c1898.zip
brcm47xx: BCMA - Update default IRQ assignment per upstream change
Update the default IRQ assignment for unrecognized devices per the upstream change. Signed-off-by: Nathan Hintz <nlhintz@hotmail.com> SVN-Revision: 35121
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
index b7cf0bced4..d06eb8f0a6 100644
--- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
+++ b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
@@ -45,6 +45,15 @@
static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
{
+@@ -316,7 +322,7 @@ void bcma_core_mips_init(struct bcma_drv
+ break;
+ default:
+ list_for_each_entry(core, &bus->cores, list) {
+- core->irq = bcma_core_mips_irq(core) + 2;
++ core->irq = bcma_core_irq(core);
+ }
+ bcma_err(bus,
+ "Unknown device (0x%x) found, can not configure IRQs\n",
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -577,7 +577,7 @@ int bcma_core_pci_plat_dev_init(struct p