diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-11-03 18:06:33 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-11-06 20:55:36 +0000 |
| commit | ad0b365573718a4a83266f98c9a49305c8eaf0b8 (patch) | |
| tree | 57cb5171c0253737415e5c137d7fde99772e64dd | |
| parent | 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 (diff) | |
| download | blackbird-op-linux-ad0b365573718a4a83266f98c9a49305c8eaf0b8.tar.gz blackbird-op-linux-ad0b365573718a4a83266f98c9a49305c8eaf0b8.zip | |
[MIPS] Ocelot C: Fix mapping of ioport address range.
o Fix warnings
o 768MB worth of I/O ports were insane
o 64-bit kernels don't need special handling because ioremap does the magic
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/momentum/ocelot_c/setup.c | 18 |
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) } } -#ifndef CONFIG_64BIT -/* This needs to be one of the first initcalls, because no I/O port access - can work before this */ +/* + * This needs to be one of the first initcalls, because no I/O port access + * can work before this + */ static int io_base_ioremap(void) { - /* we're mapping PCI accesses from 0xc0000000 to 0xf0000000 */ - void *io_remap_range = ioremap(0xc0000000, 0x30000000); + void __iomem * io_remap_range = ioremap(0xc0000000UL, 0x10000); - if (!io_remap_range) { + if (!io_remap_range) panic("Could not ioremap I/O port range"); - } - printk("io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); - set_io_port_base(io_remap_range - 0xc0000000); + + set_io_port_base((unsigned long) io_remap_range); return 0; } module_init(io_base_ioremap); -#endif #if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) |
