summaryrefslogtreecommitdiffstats
path: root/arch/mn10300/include
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-10-27 17:28:58 +0100
committerDavid Howells <dhowells@redhat.com>2010-10-27 17:28:58 +0100
commit6044cf1d9426dfd5cdc1e7b9cf8eaed6418e1ff6 (patch)
tree3f6f209d37328ce1635df8f5d0b5df1cef1afe30 /arch/mn10300/include
parent730c1fad0ee22a170d2ee76a904709ee304931c0 (diff)
downloadlinux-stable-6044cf1d9426dfd5cdc1e7b9cf8eaed6418e1ff6.tar.gz
linux-stable-6044cf1d9426dfd5cdc1e7b9cf8eaed6418e1ff6.tar.bz2
linux-stable-6044cf1d9426dfd5cdc1e7b9cf8eaed6418e1ff6.zip
MN10300: ASB2364: Handle the IRQ multiplexer in the FPGA
Handle the IRQ multiplexer in the FPGA by implementing a cascade interrupt driver for it. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300/include')
-rw-r--r--arch/mn10300/include/asm/irq.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/mn10300/include/asm/irq.h b/arch/mn10300/include/asm/irq.h
index b7b8e175b167..1a73fb3f60c6 100644
--- a/arch/mn10300/include/asm/irq.h
+++ b/arch/mn10300/include/asm/irq.h
@@ -21,11 +21,15 @@
/* this number is used when no interrupt has been assigned */
#define NO_IRQ INT_MAX
-/* hardware irq numbers */
-#ifdef CONFIG_SMP
-#define NR_IRQS GxICR_NUM_EXT_IRQS
+/*
+ * hardware irq numbers
+ * - the ASB2364 has an FPGA with an IRQ multiplexer on it
+ */
+#ifdef CONFIG_MN10300_UNIT_ASB2364
+#include <unit/irq.h>
#else
-#define NR_IRQS GxICR_NUM_IRQS
+#define NR_CPU_IRQS GxICR_NUM_IRQS
+#define NR_IRQS NR_CPU_IRQS
#endif
/* external hardware irq numbers */