git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
irqs.h
diff --git
a/arch/arm/plat-mxc/include/mach/irqs.h
b/arch/arm/plat-mxc/include/mach/irqs.h
index
00e812b
..
fd9efb0
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/irqs.h
+++ b/
arch/arm/plat-mxc/include/mach/irqs.h
@@
-14,9
+14,15
@@
#include <asm-generic/gpio.h>
/*
#include <asm-generic/gpio.h>
/*
- * SoCs with TZIC interrupt controller have 128 IRQs, those with AVIC have 64
+ * SoCs with GIC interrupt controller have 160 IRQs, those with TZIC
+ * have 128 IRQs, and those with AVIC have 64.
+ *
+ * To support single image, the biggest number should be defined on
+ * top of the list.
*/
*/
-#ifdef CONFIG_MXC_TZIC
+#if defined CONFIG_ARM_GIC
+#define MXC_INTERNAL_IRQS 160
+#elif defined CONFIG_MXC_TZIC
#define MXC_INTERNAL_IRQS 128
#else
#define MXC_INTERNAL_IRQS 64
#define MXC_INTERNAL_IRQS 128
#else
#define MXC_INTERNAL_IRQS 64