diff options
author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2008-06-16 09:51:08 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-06-16 10:14:48 -0400 |
commit | f1304b358a6c952e4cd1f92c8a6f183b1026c103 (patch) | |
tree | a92809727a37e26c6da3112c64bc95a10d256ee2 /arch/mips/pci/pci-vr41xx.c | |
parent | b8157180ccd8bb3752f510c6c434b86394636093 (diff) |
[MIPS] Vr41xx: Initialize PCI io_map_base
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci/pci-vr41xx.c')
-rw-r--r-- | arch/mips/pci/pci-vr41xx.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index 33c4f683d067..d1e049b55f34 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2003 MontaVista Software Inc. | 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. |
5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> | 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> |
6 | * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 6 | * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
@@ -300,6 +300,18 @@ static int __init vr41xx_pciu_init(void) | |||
300 | ioport_resource.end = IO_PORT_RESOURCE_END; | 300 | ioport_resource.end = IO_PORT_RESOURCE_END; |
301 | } | 301 | } |
302 | 302 | ||
303 | if (setup->master_io) { | ||
304 | void __iomem *io_map_base; | ||
305 | struct resource *res = vr41xx_pci_controller.io_resource; | ||
306 | master = setup->master_io; | ||
307 | io_map_base = ioremap(master->bus_base_address, | ||
308 | res->end - res->start + 1); | ||
309 | if (!io_map_base) | ||
310 | return -EBUSY; | ||
311 | |||
312 | vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base; | ||
313 | } | ||
314 | |||
303 | register_pci_controller(&vr41xx_pci_controller); | 315 | register_pci_controller(&vr41xx_pci_controller); |
304 | 316 | ||
305 | return 0; | 317 | return 0; |