git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ux500
/
include
/
mach
/
irqs.h
diff --git
a/arch/arm/mach-ux500/include/mach/irqs.h
b/arch/arm/mach-ux500/include/mach/irqs.h
index 7970684b1d0983841bd74e623daf93412fd8797e..10385bdc2b7760506af333077fd1fd34fe5972fc 100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/irqs.h
+++ b/
arch/arm/mach-ux500/include/mach/irqs.h
@@
-10,7
+10,8
@@
#ifndef ASM_ARCH_IRQS_H
#define ASM_ARCH_IRQS_H
#ifndef ASM_ARCH_IRQS_H
#define ASM_ARCH_IRQS_H
-#include <mach/hardware.h>
+#include <mach/irqs-db5500.h>
+#include <mach/irqs-db8500.h>
#define IRQ_LOCALTIMER 29
#define IRQ_LOCALWDOG 30
#define IRQ_LOCALTIMER 29
#define IRQ_LOCALWDOG 30
@@
-67,12
+68,21
@@
/* There are 128 shared peripheral interrupts assigned to
* INTID[160:32]. The first 32 interrupts are reserved.
*/
/* There are 128 shared peripheral interrupts assigned to
* INTID[160:32]. The first 32 interrupts are reserved.
*/
-#define
U8500_SOC_NR_IRQS
161
+#define
DBX500_NR_INTERNAL_IRQS
161
/* After chip-specific IRQ numbers we have the GPIO ones */
#define NOMADIK_NR_GPIO 288
/* After chip-specific IRQ numbers we have the GPIO ones */
#define NOMADIK_NR_GPIO 288
-#define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) +
U8500_SOC_NR
_IRQS)
-#define NOMADIK_IRQ_TO_GPIO(irq) ((irq) -
U8500_SOC_NR
_IRQS)
-#define
NR_IRQS
NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO)
+#define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) +
DBX500_NR_INTERNAL
_IRQS)
+#define NOMADIK_IRQ_TO_GPIO(irq) ((irq) -
DBX500_NR_INTERNAL
_IRQS)
+#define
IRQ_BOARD_START
NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO)
-#endif /*ASM_ARCH_IRQS_H*/
+/* This will be overridden by board-specific irq headers */
+#define IRQ_BOARD_END IRQ_BOARD_START
+
+#ifdef CONFIG_MACH_U8500_MOP
+#include <mach/irqs-board-mop500.h>
+#endif
+
+#define NR_IRQS IRQ_BOARD_END
+
+#endif /* ASM_ARCH_IRQS_H */