This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / vr41xx / zao-capcella / setup.c

diff --git a/arch/mips/vr41xx/zao-capcella/setup.c b/arch/mips/vr41xx/zao-capcella/setup.c
index 35b3a0a..8b1e178 100644 (file)
--- a/arch/mips/vr41xx/zao-capcella/setup.c
+++ b/arch/mips/vr41xx/zao-capcella/setup.c
@@ -18,8 +18,59 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/config.h>
+#include <linux/ioport.h>
 
-#include <asm/vr41xx/vr41xx.h>
+#include <asm/io.h>
+#include <asm/pci_channel.h>
+#include <asm/vr41xx/capcella.h>
+
+#ifdef CONFIG_PCI
+static struct resource vr41xx_pci_io_resource = {
+       "PCI I/O space",
+       VR41XX_PCI_IO_START,
+       VR41XX_PCI_IO_END,
+       IORESOURCE_IO
+};
+
+static struct resource vr41xx_pci_mem_resource = {
+       "PCI memory space",
+       VR41XX_PCI_MEM_START,
+       VR41XX_PCI_MEM_END,
+       IORESOURCE_MEM
+};
+
+extern struct pci_ops vr41xx_pci_ops;
+
+struct pci_controller vr41xx_controller = {
+       .pci_ops        = &vr41xx_pci_ops,
+       .io_resource    = &vr41xx_pci_io_resource,
+       .mem_resource   = &vr41xx_pci_mem_resource,
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
+       VR41XX_PCI_MEM1_BASE,
+       VR41XX_PCI_MEM1_MASK,
+       IO_MEM1_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
+       VR41XX_PCI_MEM2_BASE,
+       VR41XX_PCI_MEM2_MASK,
+       IO_MEM2_RESOURCE_START
+};
+
+struct vr41xx_pci_address_space vr41xx_pci_io = {
+       VR41XX_PCI_IO_BASE,
+       VR41XX_PCI_IO_MASK,
+       IO_PORT_RESOURCE_START
+};
+
+static struct vr41xx_pci_address_map pci_address_map = {
+       &vr41xx_pci_mem1,
+       &vr41xx_pci_mem2,
+       &vr41xx_pci_io
+};
+#endif
 
 const char *get_system_type(void)
 {
@@ -28,12 +79,20 @@ const char *get_system_type(void)
 
 static int zao_capcella_setup(void)
 {
+       set_io_port_base(IO_PORT_BASE);
+       ioport_resource.start = IO_PORT_RESOURCE_START;
+       ioport_resource.end = IO_PORT_RESOURCE_END;
+
 #ifdef CONFIG_SERIAL_8250
        vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
        vr41xx_siu_init();
        vr41xx_dsiu_init();
 #endif
 
+#ifdef CONFIG_PCI
+       vr41xx_pciu_init(&pci_address_map);
+#endif
+
        return 0;
 }