aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/momentum/ocelot_c/setup.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index 7832d4e04c38..b0e82a097f7e 100644
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -344,25 +344,23 @@ void __init plat_mem_setup(void)
344 } 344 }
345} 345}
346 346
347#ifndef CONFIG_64BIT 347/*
348/* This needs to be one of the first initcalls, because no I/O port access 348 * This needs to be one of the first initcalls, because no I/O port access
349 can work before this */ 349 * can work before this
350 */
350static int io_base_ioremap(void) 351static int io_base_ioremap(void)
351{ 352{
352 /* we're mapping PCI accesses from 0xc0000000 to 0xf0000000 */ 353 void __iomem * io_remap_range = ioremap(0xc0000000UL, 0x10000);
353 void *io_remap_range = ioremap(0xc0000000, 0x30000000);
354 354
355 if (!io_remap_range) { 355 if (!io_remap_range)
356 panic("Could not ioremap I/O port range"); 356 panic("Could not ioremap I/O port range");
357 } 357
358 printk("io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); 358 set_io_port_base((unsigned long) io_remap_range);
359 set_io_port_base(io_remap_range - 0xc0000000);
360 359
361 return 0; 360 return 0;
362} 361}
363 362
364module_init(io_base_ioremap); 363module_init(io_base_ioremap);
365#endif
366 364
367#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) 365#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE)
368 366