Update of /cvsroot/linux-mips/linux/arch/mips/cobalt
In directory usw-pr-cvs1:/tmp/cvs-serv28647/cobalt
Modified Files:
pci_fixups.c pci_ops.c setup.c
Log Message:
Fixed the problem with the new pci code with the qube. Now just to fix the issues with pci_auto.
Index: pci_fixups.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/pci_fixups.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pci_fixups.c 2001/10/24 18:53:29 1.2
+++ pci_fixups.c 2001/10/25 21:39:48 1.3
@@ -334,24 +334,6 @@
struct pci_dev *dev;
pci_for_each_dev(dev) {
-/*
- switch (dev->vendor) {
- case PCI_VENDOR_ID_NEC:
- switch (dev->device) {
- case PCI_DEVICE_ID_NEC_VRC4173_BCU:
- case PCI_DEVICE_ID_NEC_VRC4173_AC97:
- case PCI_DEVICE_ID_NEC_VRC4173_CARDU:
- case PCI_DEVICE_ID_NEC_VRC4173_USB:
- dev->irq = VR4122_IRQ_VRC4173;
- break;
- }
- break;
- case PCI_VENDOR_ID_MEDIAQ:
- if (dev->device == PCI_DEVICE_ID_MEDIAQ_MQ200)
- dev->irq = VR4122_IRQ_MQ200;
- break;
- }
-*/
}
}
Index: pci_ops.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/pci_ops.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci_ops.c 2001/10/24 21:41:32 1.4
+++ pci_ops.c 2001/10/25 21:39:48 1.5
@@ -48,6 +48,8 @@
#define IO_BASE 0x00000000
#define IO_SIZE 0x1CFFFFFF
+#define MEM_BASE 0x00000000
+#define MEM_SIZE 0x1CFFFFFF
static struct resource pci_io_resource = {
"pci IO space",
@@ -58,8 +60,8 @@
static struct resource pci_mem_resource = {
"pci memory space",
- 0,
- 0,
+ MEM_BASE,
+ MEM_BASE + MEM_SIZE,
IORESOURCE_MEM
};
@@ -76,7 +78,8 @@
*/
struct pci_channel mips_pci_channels[] = {
{ &qube_pci_ops, &pci_io_resource, &pci_mem_resource, 0, 0xFF },
- { NULL, NULL, NULL, NULL, NULL}
+ {(struct pci_ops *) NULL, (struct resource *) NULL,
+ (struct resource *) NULL, (int) NULL, (int) NULL}
};
#define PCI_CFG_DATA ((volatile unsigned long *)0xb4000cfc)
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c 2001/09/26 20:16:04 1.5
+++ setup.c 2001/10/25 21:39:48 1.6
@@ -54,8 +54,6 @@
static struct resource res_pic2 =
{ "pic2", 0xb00000A0, 0xb00000BF, IORESOURCE_IO };
-
-
void __init cobalt_irq_setup(void)
{
/*
@@ -103,7 +101,7 @@
*timer_reg = 500000;
}
-static void __init cobalt_time_init(struct irqaction *irq)
+static void __init cobalt_timer_setup(struct irqaction *irq)
{
/* Load timer value for 150 Hz */
cobalt_calibrate_timer();
@@ -125,18 +123,24 @@
void __init cobalt_setup(void)
{
+ /*
+ * IO/MEM resources.
+ */
+ mips_io_port_base = COBALT_LOCAL_IO_SPACE;
+ ioport_resource.start = 0;
+ ioport_resource.end = 0xffffffff;
+ iomem_resource.start = 0;
+ ioport_resource.end = 0xffffffff;
_machine_restart = cobalt_machine_restart;
_machine_halt = cobalt_machine_halt;
_machine_power_off = cobalt_machine_power_off;
- board_time_init = cobalt_time_init;
+ board_time_init = cobalt_timer_setup;
rtc_ops = &cobalt_rtc_ops;
#ifdef CONFIG_BLK_DEV_IDE
ide_ops = &cobalt_ide_ops;
#endif
- mips_io_port_base = COBALT_LOCAL_IO_SPACE;
-
/*ns16550_setup_console();*/
/* We have to do this early, here, before the value could
|
