Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / mips / pci / pci-vr41xx.c

diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c
index 240df9e..d1e049b 100644 (file)
--- a/arch/mips/pci/pci-vr41xx.c
+++ b/arch/mips/pci/pci-vr41xx.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001-2003 MontaVista Software Inc.
  *    Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
- *  Copyright (C) 2004-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2004-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *  Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -154,6 +154,7 @@ static int __init vr41xx_pciu_init(void)
                pciu_write(PCICLKSELREG, QUARTER_VTCLOCK);
        else {
                printk(KERN_ERR "PCI Clock is over 33MHz.\n");
+               iounmap(pciu_base);
                return -EINVAL;
        }
 
@@ -299,6 +300,18 @@ static int __init vr41xx_pciu_init(void)
                ioport_resource.end = IO_PORT_RESOURCE_END;
        }
 
+       if (setup->master_io) {
+               void __iomem *io_map_base;
+               struct resource *res = vr41xx_pci_controller.io_resource;
+               master = setup->master_io;
+               io_map_base = ioremap(master->bus_base_address,
+                                     res->end - res->start + 1);
+               if (!io_map_base)
+                       return -EBUSY;
+
+               vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base;
+       }
+
        register_pci_controller(&vr41xx_pci_controller);
 
        return 0;