aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-omap/include/mach')
-rw-r--r--arch/arm/plat-omap/include/mach/entry-macro.S9
-rw-r--r--arch/arm/plat-omap/include/mach/omap24xx.h2
-rw-r--r--arch/arm/plat-omap/include/mach/omap34xx.h1
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/include/mach/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S
index 2276f89671d8..33256a0e9a28 100644
--- a/arch/arm/plat-omap/include/mach/entry-macro.S
+++ b/arch/arm/plat-omap/include/mach/entry-macro.S
@@ -58,11 +58,14 @@
58#endif 58#endif
59#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) 59#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
60 60
61#if defined(CONFIG_ARCH_OMAP24XX)
62#include <mach/omap24xx.h> 61#include <mach/omap24xx.h>
63#endif
64#if defined(CONFIG_ARCH_OMAP34XX)
65#include <mach/omap34xx.h> 62#include <mach/omap34xx.h>
63
64/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */
65#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430)
66#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)
67#elif defined(CONFIG_ARCH_OMAP34XX)
68#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)
66#endif 69#endif
67 70
68#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ 71#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */
diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h
index 10a6413c73e8..4ce9b6a60a52 100644
--- a/arch/arm/plat-omap/include/mach/omap24xx.h
+++ b/arch/arm/plat-omap/include/mach/omap24xx.h
@@ -89,13 +89,11 @@
89 89
90#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE 90#define OMAP2_PRCM_BASE OMAP2420_PRCM_BASE
91#define OMAP2_CM_BASE OMAP2420_CM_BASE 91#define OMAP2_CM_BASE OMAP2420_CM_BASE
92#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)
93 92
94#elif defined(CONFIG_ARCH_OMAP2430) 93#elif defined(CONFIG_ARCH_OMAP2430)
95 94
96#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE 95#define OMAP2_PRCM_BASE OMAP2430_PRCM_BASE
97#define OMAP2_CM_BASE OMAP2430_CM_BASE 96#define OMAP2_CM_BASE OMAP2430_CM_BASE
98#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE)
99 97
100#endif 98#endif
101 99
diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index 423306444202..36c99ca08252 100644
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -86,7 +86,6 @@
86#if defined(CONFIG_ARCH_OMAP3430) 86#if defined(CONFIG_ARCH_OMAP3430)
87 87
88#define OMAP2_CM_BASE OMAP3430_CM_BASE 88#define OMAP2_CM_BASE OMAP3430_CM_BASE
89#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)
90 89
91#endif 90#endif
92 91