diff options
author | Christoph Egger <siccegge@cs.fau.de> | 2010-07-05 09:31:54 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 10:03:58 -0400 |
commit | df8d481df912b73fadbff03759cb1b257a37e277 (patch) | |
tree | 86c78cfdc3e5b6e59c679c5bca7176ce81e538f4 /arch | |
parent | ab6f7751905e5cf713d081dbb3b97b8f6909ab34 (diff) |
Removing dead OMAP_STI
OMAP_STI doesn't exist in Kconfig, therefore removing all
references for it from the source code.
Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 35 | ||||
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 57 |
2 files changed, 0 insertions, 92 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index c00d602a2599..aa0725608fb1 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -193,42 +193,7 @@ static inline void omap_init_spi100k(void) | |||
193 | 193 | ||
194 | /*-------------------------------------------------------------------------*/ | 194 | /*-------------------------------------------------------------------------*/ |
195 | 195 | ||
196 | #if defined(CONFIG_OMAP_STI) | ||
197 | |||
198 | #define OMAP1_STI_BASE 0xfffea000 | ||
199 | #define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400) | ||
200 | |||
201 | static struct resource sti_resources[] = { | ||
202 | { | ||
203 | .start = OMAP1_STI_BASE, | ||
204 | .end = OMAP1_STI_BASE + SZ_1K - 1, | ||
205 | .flags = IORESOURCE_MEM, | ||
206 | }, | ||
207 | { | ||
208 | .start = OMAP1_STI_CHANNEL_BASE, | ||
209 | .end = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1, | ||
210 | .flags = IORESOURCE_MEM, | ||
211 | }, | ||
212 | { | ||
213 | .start = INT_1610_STI, | ||
214 | .flags = IORESOURCE_IRQ, | ||
215 | } | ||
216 | }; | ||
217 | |||
218 | static struct platform_device sti_device = { | ||
219 | .name = "sti", | ||
220 | .id = -1, | ||
221 | .num_resources = ARRAY_SIZE(sti_resources), | ||
222 | .resource = sti_resources, | ||
223 | }; | ||
224 | |||
225 | static inline void omap_init_sti(void) | ||
226 | { | ||
227 | platform_device_register(&sti_device); | ||
228 | } | ||
229 | #else | ||
230 | static inline void omap_init_sti(void) {} | 196 | static inline void omap_init_sti(void) {} |
231 | #endif | ||
232 | 197 | ||
233 | /*-------------------------------------------------------------------------*/ | 198 | /*-------------------------------------------------------------------------*/ |
234 | 199 | ||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 3ae9d0a477b6..162a9be3cbb1 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -229,64 +229,7 @@ static inline void omap_init_mbox(void) | |||
229 | static inline void omap_init_mbox(void) { } | 229 | static inline void omap_init_mbox(void) { } |
230 | #endif /* CONFIG_OMAP_MBOX_FWK */ | 230 | #endif /* CONFIG_OMAP_MBOX_FWK */ |
231 | 231 | ||
232 | #if defined(CONFIG_OMAP_STI) | ||
233 | |||
234 | #if defined(CONFIG_ARCH_OMAP2) | ||
235 | |||
236 | #define OMAP2_STI_BASE 0x48068000 | ||
237 | #define OMAP2_STI_CHANNEL_BASE 0x54000000 | ||
238 | #define OMAP2_STI_IRQ 4 | ||
239 | |||
240 | static struct resource sti_resources[] = { | ||
241 | { | ||
242 | .start = OMAP2_STI_BASE, | ||
243 | .end = OMAP2_STI_BASE + 0x7ff, | ||
244 | .flags = IORESOURCE_MEM, | ||
245 | }, | ||
246 | { | ||
247 | .start = OMAP2_STI_CHANNEL_BASE, | ||
248 | .end = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1, | ||
249 | .flags = IORESOURCE_MEM, | ||
250 | }, | ||
251 | { | ||
252 | .start = OMAP2_STI_IRQ, | ||
253 | .flags = IORESOURCE_IRQ, | ||
254 | } | ||
255 | }; | ||
256 | #elif defined(CONFIG_ARCH_OMAP3) | ||
257 | |||
258 | #define OMAP3_SDTI_BASE 0x54500000 | ||
259 | #define OMAP3_SDTI_CHANNEL_BASE 0x54600000 | ||
260 | |||
261 | static struct resource sti_resources[] = { | ||
262 | { | ||
263 | .start = OMAP3_SDTI_BASE, | ||
264 | .end = OMAP3_SDTI_BASE + 0xFFF, | ||
265 | .flags = IORESOURCE_MEM, | ||
266 | }, | ||
267 | { | ||
268 | .start = OMAP3_SDTI_CHANNEL_BASE, | ||
269 | .end = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1, | ||
270 | .flags = IORESOURCE_MEM, | ||
271 | } | ||
272 | }; | ||
273 | |||
274 | #endif | ||
275 | |||
276 | static struct platform_device sti_device = { | ||
277 | .name = "sti", | ||
278 | .id = -1, | ||
279 | .num_resources = ARRAY_SIZE(sti_resources), | ||
280 | .resource = sti_resources, | ||
281 | }; | ||
282 | |||
283 | static inline void omap_init_sti(void) | ||
284 | { | ||
285 | platform_device_register(&sti_device); | ||
286 | } | ||
287 | #else | ||
288 | static inline void omap_init_sti(void) {} | 232 | static inline void omap_init_sti(void) {} |
289 | #endif | ||
290 | 233 | ||
291 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) | 234 | #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) |
292 | 235 | ||