diff options
Diffstat (limited to 'arch/arm/mach-pxa/corgi.c')
| -rw-r--r-- | arch/arm/mach-pxa/corgi.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index f691cf77d390..276431bf1ce7 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
| @@ -287,34 +287,40 @@ static void __init corgi_map_io(void) | |||
| 287 | 287 | ||
| 288 | #ifdef CONFIG_MACH_CORGI | 288 | #ifdef CONFIG_MACH_CORGI |
| 289 | MACHINE_START(CORGI, "SHARP Corgi") | 289 | MACHINE_START(CORGI, "SHARP Corgi") |
| 290 | BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) | 290 | .phys_ram = 0xa0000000, |
| 291 | FIXUP(fixup_corgi) | 291 | .phys_io = 0x40000000, |
| 292 | MAPIO(corgi_map_io) | 292 | .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) |
| 293 | INITIRQ(corgi_init_irq) | 293 | .fixup = fixup_corgi, |
| 294 | .init_machine = corgi_init, | 294 | .map_io = corgi_map_io, |
| 295 | .timer = &pxa_timer, | 295 | .init_irq = corgi_init_irq, |
| 296 | .init_machine = corgi_init, | ||
| 297 | .timer = &pxa_timer, | ||
| 296 | MACHINE_END | 298 | MACHINE_END |
| 297 | #endif | 299 | #endif |
| 298 | 300 | ||
| 299 | #ifdef CONFIG_MACH_SHEPHERD | 301 | #ifdef CONFIG_MACH_SHEPHERD |
| 300 | MACHINE_START(SHEPHERD, "SHARP Shepherd") | 302 | MACHINE_START(SHEPHERD, "SHARP Shepherd") |
| 301 | BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) | 303 | .phys_ram = 0xa0000000, |
| 302 | FIXUP(fixup_corgi) | 304 | .phys_io = 0x40000000, |
| 303 | MAPIO(corgi_map_io) | 305 | .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) |
| 304 | INITIRQ(corgi_init_irq) | 306 | .fixup = fixup_corgi, |
| 305 | .init_machine = corgi_init, | 307 | .map_io = corgi_map_io, |
| 306 | .timer = &pxa_timer, | 308 | .init_irq = corgi_init_irq, |
| 309 | .init_machine = corgi_init, | ||
| 310 | .timer = &pxa_timer, | ||
| 307 | MACHINE_END | 311 | MACHINE_END |
| 308 | #endif | 312 | #endif |
| 309 | 313 | ||
| 310 | #ifdef CONFIG_MACH_HUSKY | 314 | #ifdef CONFIG_MACH_HUSKY |
| 311 | MACHINE_START(HUSKY, "SHARP Husky") | 315 | MACHINE_START(HUSKY, "SHARP Husky") |
| 312 | BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) | 316 | .phys_ram = 0xa0000000, |
| 313 | FIXUP(fixup_corgi) | 317 | .phys_io = 0x40000000, |
| 314 | MAPIO(corgi_map_io) | 318 | .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) |
| 315 | INITIRQ(corgi_init_irq) | 319 | .fixup = fixup_corgi, |
| 316 | .init_machine = corgi_init, | 320 | .map_io = corgi_map_io, |
| 317 | .timer = &pxa_timer, | 321 | .init_irq = corgi_init_irq, |
| 322 | .init_machine = corgi_init, | ||
| 323 | .timer = &pxa_timer, | ||
| 318 | MACHINE_END | 324 | MACHINE_END |
| 319 | #endif | 325 | #endif |
| 320 | 326 | ||