diff options
| author | Tony Lindgren <tony@atomide.com> | 2005-11-10 14:26:53 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-10 14:26:53 +0000 |
| commit | 9ad5897c2659b3c610e0c717e8b3dbfb496d2c74 (patch) | |
| tree | e3c54fd65813d0bea79e42b32cf8bfaf60643e1d /include/asm-arm/arch-omap/entry-macro.S | |
| parent | 046d6b28ebce92aab2865aa3eb3a0d8ede57e17e (diff) | |
| download | kernel_samsung_aries-9ad5897c2659b3c610e0c717e8b3dbfb496d2c74.zip kernel_samsung_aries-9ad5897c2659b3c610e0c717e8b3dbfb496d2c74.tar.gz kernel_samsung_aries-9ad5897c2659b3c610e0c717e8b3dbfb496d2c74.tar.bz2 | |
[ARM] 3143/1: OMAP 4/5: Update omap include files
Patch from Tony Lindgren
This patch syncs the mainline kernel with linux-omap tree.
This patch contains changes to common header files for
omap1xxx and omap24xx by various omap developers, and
improved cpu detection by Imre Deak
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-omap/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-omap/entry-macro.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S index 0d29b9c..f8814a8 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/include/asm-arm/arch-omap/entry-macro.S @@ -10,6 +10,20 @@ #if defined(CONFIG_ARCH_OMAP1) +#if defined(CONFIG_ARCH_OMAP730) && \ + (defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)) +#error "FIXME: OMAP730 doesn't support multiple-OMAP" +#elif defined(CONFIG_ARCH_OMAP730) +#define INT_IH2_IRQ INT_730_IH2_IRQ +#elif defined(CONFIG_ARCH_OMAP15XX) +#define INT_IH2_IRQ INT_1510_IH2_IRQ +#elif defined(CONFIG_ARCH_OMAP16XX) +#define INT_IH2_IRQ INT_1610_IH2_IRQ +#else +#warning "IH2 IRQ defaulted" +#define INT_IH2_IRQ INT_1510_IH2_IRQ +#endif + .macro disable_fiq .endm |