diff options
Diffstat (limited to 'arch/mips/cobalt/setup.c')
-rw-r--r-- | arch/mips/cobalt/setup.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index 88d34f11385a..d0dd81790f74 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -19,12 +19,10 @@ | |||
19 | #include <asm/bootinfo.h> | 19 | #include <asm/bootinfo.h> |
20 | #include <asm/time.h> | 20 | #include <asm/time.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/irq.h> | ||
23 | #include <asm/processor.h> | ||
24 | #include <asm/reboot.h> | 22 | #include <asm/reboot.h> |
25 | #include <asm/gt64120.h> | 23 | #include <asm/gt64120.h> |
26 | 24 | ||
27 | #include <asm/mach-cobalt/cobalt.h> | 25 | #include <cobalt.h> |
28 | 26 | ||
29 | extern void cobalt_machine_restart(char *command); | 27 | extern void cobalt_machine_restart(char *command); |
30 | extern void cobalt_machine_halt(void); | 28 | extern void cobalt_machine_halt(void); |
@@ -63,22 +61,6 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
63 | GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS)); | 61 | GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS)); |
64 | } | 62 | } |
65 | 63 | ||
66 | extern struct pci_ops gt64111_pci_ops; | ||
67 | |||
68 | static struct resource cobalt_mem_resource = { | ||
69 | .start = GT_DEF_PCI0_MEM0_BASE, | ||
70 | .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1, | ||
71 | .name = "PCI memory", | ||
72 | .flags = IORESOURCE_MEM | ||
73 | }; | ||
74 | |||
75 | static struct resource cobalt_io_resource = { | ||
76 | .start = 0x1000, | ||
77 | .end = 0xffff, | ||
78 | .name = "PCI I/O", | ||
79 | .flags = IORESOURCE_IO | ||
80 | }; | ||
81 | |||
82 | /* | 64 | /* |
83 | * Cobalt doesn't have PS/2 keyboard/mouse interfaces, | 65 | * Cobalt doesn't have PS/2 keyboard/mouse interfaces, |
84 | * keyboard conntroller is never used. | 66 | * keyboard conntroller is never used. |
@@ -111,14 +93,6 @@ static struct resource cobalt_reserved_resources[] = { | |||
111 | }, | 93 | }, |
112 | }; | 94 | }; |
113 | 95 | ||
114 | static struct pci_controller cobalt_pci_controller = { | ||
115 | .pci_ops = >64111_pci_ops, | ||
116 | .mem_resource = &cobalt_mem_resource, | ||
117 | .mem_offset = 0, | ||
118 | .io_resource = &cobalt_io_resource, | ||
119 | .io_offset = 0 - GT_DEF_PCI0_IO_BASE, | ||
120 | }; | ||
121 | |||
122 | void __init plat_mem_setup(void) | 96 | void __init plat_mem_setup(void) |
123 | { | 97 | { |
124 | static struct uart_port uart; | 98 | static struct uart_port uart; |
@@ -146,10 +120,6 @@ void __init plat_mem_setup(void) | |||
146 | 120 | ||
147 | printk("Cobalt board ID: %d\n", cobalt_board_id); | 121 | printk("Cobalt board ID: %d\n", cobalt_board_id); |
148 | 122 | ||
149 | #ifdef CONFIG_PCI | ||
150 | register_pci_controller(&cobalt_pci_controller); | ||
151 | #endif | ||
152 | |||
153 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { | 123 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { |
154 | #ifdef CONFIG_SERIAL_8250 | 124 | #ifdef CONFIG_SERIAL_8250 |
155 | uart.line = 0; | 125 | uart.line = 0; |