aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-15 13:04:59 -0400
committerMike Frysinger <vapier@gentoo.org>2011-05-25 08:13:43 -0400
commit8c0541035007bd8bbacfc5d71c696cdf37696794 (patch)
tree3731d537dcb31b6decfc5493be6f4d5f3d055fb2 /arch/blackfin/kernel
parente2a8092c3fa9766248e9515252ae44e6df2d97a0 (diff)
Blackfin: bf537: demux port H mask A and emac rx ints
The BF537 SIC combines the gpio port H mask A interrupts with the emac rx interrupt, so we need to demux this in software. It also combines the gpio port H mask B and the emac tx interrupts, and the watchdog and port F mask B interrupts, but since we don't support mask B yet, just add the defines for now. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/bfin_gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 207bb6b11b5c..f9306bb5aede 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -535,7 +535,7 @@ static const unsigned int sic_iwr_irqs[] = {
535#if defined(BF533_FAMILY) 535#if defined(BF533_FAMILY)
536 IRQ_PROG_INTB 536 IRQ_PROG_INTB
537#elif defined(BF537_FAMILY) 537#elif defined(BF537_FAMILY)
538 IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX 538 IRQ_PF_INTB_WATCH, IRQ_PORTG_INTB, IRQ_PH_INTB_MAC_TX
539#elif defined(BF538_FAMILY) 539#elif defined(BF538_FAMILY)
540 IRQ_PORTF_INTB 540 IRQ_PORTF_INTB
541#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x) 541#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)