diff options
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r-- | arch/arm/mach-omap2/common.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index cda888a2e635..9403b2ce6c85 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
@@ -52,10 +52,18 @@ static inline void omap34xx_map_common_io(void) | |||
52 | } | 52 | } |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #ifdef CONFIG_SOC_OMAPTI816X | 55 | #ifdef CONFIG_SOC_OMAPTI81XX |
56 | extern void omapti816x_map_common_io(void); | 56 | extern void omapti81xx_map_common_io(void); |
57 | #else | 57 | #else |
58 | static inline void omapti816x_map_common_io(void) | 58 | static inline void omapti81xx_map_common_io(void) |
59 | { | ||
60 | } | ||
61 | #endif | ||
62 | |||
63 | #ifdef CONFIG_SOC_OMAPAM33XX | ||
64 | extern void omapam33xx_map_common_io(void); | ||
65 | #else | ||
66 | static inline void omapam33xx_map_common_io(void) | ||
59 | { | 67 | { |
60 | } | 68 | } |
61 | #endif | 69 | #endif |
@@ -82,7 +90,7 @@ void omap35xx_init_early(void); | |||
82 | void omap3630_init_early(void); | 90 | void omap3630_init_early(void); |
83 | void omap3_init_early(void); /* Do not use this one */ | 91 | void omap3_init_early(void); /* Do not use this one */ |
84 | void am35xx_init_early(void); | 92 | void am35xx_init_early(void); |
85 | void ti816x_init_early(void); | 93 | void ti81xx_init_early(void); |
86 | void omap4430_init_early(void); | 94 | void omap4430_init_early(void); |
87 | void omap_prcm_restart(char, const char *); | 95 | void omap_prcm_restart(char, const char *); |
88 | 96 | ||
@@ -107,7 +115,8 @@ void omap2_set_globals_242x(void); | |||
107 | void omap2_set_globals_243x(void); | 115 | void omap2_set_globals_243x(void); |
108 | void omap2_set_globals_3xxx(void); | 116 | void omap2_set_globals_3xxx(void); |
109 | void omap2_set_globals_443x(void); | 117 | void omap2_set_globals_443x(void); |
110 | void omap2_set_globals_ti816x(void); | 118 | void omap2_set_globals_ti81xx(void); |
119 | void omap2_set_globals_am33xx(void); | ||
111 | 120 | ||
112 | /* These get called from omap2_set_globals_xxxx(), do not call these */ | 121 | /* These get called from omap2_set_globals_xxxx(), do not call these */ |
113 | void omap2_set_globals_tap(struct omap_globals *); | 122 | void omap2_set_globals_tap(struct omap_globals *); |
@@ -118,7 +127,9 @@ void omap2_set_globals_prcm(struct omap_globals *); | |||
118 | void omap242x_map_io(void); | 127 | void omap242x_map_io(void); |
119 | void omap243x_map_io(void); | 128 | void omap243x_map_io(void); |
120 | void omap3_map_io(void); | 129 | void omap3_map_io(void); |
130 | void am33xx_map_io(void); | ||
121 | void omap4_map_io(void); | 131 | void omap4_map_io(void); |
132 | void ti81xx_map_io(void); | ||
122 | 133 | ||
123 | /** | 134 | /** |
124 | * omap_test_timeout - busy-loop, testing a condition | 135 | * omap_test_timeout - busy-loop, testing a condition |
@@ -147,7 +158,7 @@ extern struct device *omap4_get_dsp_device(void); | |||
147 | 158 | ||
148 | void omap2_init_irq(void); | 159 | void omap2_init_irq(void); |
149 | void omap3_init_irq(void); | 160 | void omap3_init_irq(void); |
150 | void ti816x_init_irq(void); | 161 | void ti81xx_init_irq(void); |
151 | extern int omap_irq_pending(void); | 162 | extern int omap_irq_pending(void); |
152 | void omap_intc_save_context(void); | 163 | void omap_intc_save_context(void); |
153 | void omap_intc_restore_context(void); | 164 | void omap_intc_restore_context(void); |