summary refs log tree commit diff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2010-02-03 21:28:11 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-02-08 16:50:54 -0500
commit83e34f03ee9b86b49bde4707a1fe03a1837e29be (patch)
tree2c8169f323e58a9b633b36dff5909b70a3df43d4 /drivers/ssb
parent0866b03c7d7dee8a34ffa527ecda426c0f405518 (diff)
downloadlinux-83e34f03ee9b86b49bde4707a1fe03a1837e29be.tar.gz
ssb: fix interrupt assignment
Explicitely enable shared interrupt 2 for any core that didn't get a dedicated IRQ
anymore (fallthrough case) and for EXTIF cores to make gpio interrupts work.
Also remove a bogus comment.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/driver_mipscore.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 3c6feed46f6e..97efce184a8f 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
 				set_irq(dev, irq++);
 			}
 			break;
-			/* fallthrough */
 		case SSB_DEV_PCI:
 		case SSB_DEV_ETHERNET:
 		case SSB_DEV_ETHERNET_GBIT:
@@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipscore *mcore)
 				set_irq(dev, irq++);
 				break;
 			}
+			/* fallthrough */
+		case SSB_DEV_EXTIF:
+			set_irq(dev, 0);
+			break;
 		}
 	}
 	ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");