[Linux-mips-commits]CVS: linux/arch/mips/cobalt Makefile,1.5,1.6 pci_fixups.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/cobalt
In directory usw-pr-cvs1:/tmp/cvs-serv22960

Modified Files:
	Makefile pci_fixups.c 
Log Message:
Further approach to new pci code.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	2001/10/23 23:01:44	1.5
+++ Makefile	2001/10/24 18:53:29	1.6
@@ -16,7 +16,7 @@
 
 O_TARGET := cobalt.o
 
-obj-y   += rtc_qube.o irq.o int-handler.o pci.o pci_fixups.o pci_ops.o \
+obj-y   += rtc_qube.o irq.o int-handler.o pci_fixups.o pci_ops.o \
 		reset.o setup.o via.o promcon.o ide.o
 
 include $(TOPDIR)/Rules.make

Index: pci_fixups.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/pci_fixups.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci_fixups.c	2001/10/23 23:01:44	1.1
+++ pci_fixups.c	2001/10/24 18:53:29	1.2
@@ -309,17 +309,6 @@
 	}
 }
 
-struct pci_fixup pcibios_fixups[] = {
-	/* TBD:: Add each device here and divvy up pcibios_fixup */
-	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, qube_raq_via_bmIDE_fixup },
-	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, qube_raq_tulip_fixup },
-	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_GALILEO, PCI_ANY_ID, qube_raq_galileo_fixup },
-	/* Not sure about what scsi chips are available on the RAQ, put an
-   	   entry for all */
-	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C860, qube_raq_scsi_fixup },
-	{ PCI_FIXUP_HEADER, PCI_ANY_ID, PCI_ANY_ID, qube_pcibios_fixup }
-};
-
 /*
  * Fixup your resources here, if necessary. *Usually* you 
  * don't have to do anything here.
@@ -328,6 +317,11 @@
 void __init pcibios_fixup_resources(struct pci_dev *dev)
 {
 	/* will need to fixup IO resources */	
+	qube_raq_via_bmIDE_fixup(dev);
+	qube_raq_tulip_fixup(dev);
+	qube_raq_galileo_fixup(dev);
+	qube_raq_scsi_fixup(dev);
+	qube_pcibios_fixup(dev);
 }
 
 /*
@@ -375,6 +369,6 @@
 
 unsigned int pcibios_assign_all_busses(void)
 {
-        return 0;
+        return 1;
 }
 #endif