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 012bac7d56a5..4b2b416fafe1 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 | 95 | ||
88 | /* | 96 | /* |
@@ -106,7 +114,8 @@ void omap2_set_globals_242x(void); | |||
106 | void omap2_set_globals_243x(void); | 114 | void omap2_set_globals_243x(void); |
107 | void omap2_set_globals_3xxx(void); | 115 | void omap2_set_globals_3xxx(void); |
108 | void omap2_set_globals_443x(void); | 116 | void omap2_set_globals_443x(void); |
109 | void omap2_set_globals_ti816x(void); | 117 | void omap2_set_globals_ti81xx(void); |
118 | void omap2_set_globals_am33xx(void); | ||
110 | 119 | ||
111 | /* These get called from omap2_set_globals_xxxx(), do not call these */ | 120 | /* These get called from omap2_set_globals_xxxx(), do not call these */ |
112 | void omap2_set_globals_tap(struct omap_globals *); | 121 | void omap2_set_globals_tap(struct omap_globals *); |
@@ -117,7 +126,9 @@ void omap2_set_globals_prcm(struct omap_globals *); | |||
117 | void omap242x_map_io(void); | 126 | void omap242x_map_io(void); |
118 | void omap243x_map_io(void); | 127 | void omap243x_map_io(void); |
119 | void omap3_map_io(void); | 128 | void omap3_map_io(void); |
129 | void am33xx_map_io(void); | ||
120 | void omap4_map_io(void); | 130 | void omap4_map_io(void); |
131 | void ti81xx_map_io(void); | ||
121 | 132 | ||
122 | /** | 133 | /** |
123 | * omap_test_timeout - busy-loop, testing a condition | 134 | * omap_test_timeout - busy-loop, testing a condition |
@@ -146,7 +157,7 @@ extern struct device *omap4_get_dsp_device(void); | |||
146 | 157 | ||
147 | void omap2_init_irq(void); | 158 | void omap2_init_irq(void); |
148 | void omap3_init_irq(void); | 159 | void omap3_init_irq(void); |
149 | void ti816x_init_irq(void); | 160 | void ti81xx_init_irq(void); |
150 | extern int omap_irq_pending(void); | 161 | extern int omap_irq_pending(void); |
151 | void omap_intc_save_context(void); | 162 | void omap_intc_save_context(void); |
152 | void omap_intc_restore_context(void); | 163 | void omap_intc_restore_context(void); |