aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/cobalt/setup.c
diff options
context:
space:
mode:
authorYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>2007-03-05 05:10:03 -0500
committerRalf Baechle <ralf@linux-mips.org>2007-04-27 11:20:23 -0400
commit2a9effc67804102d6d5182eb0116520588ae2256 (patch)
tree7ae021afd779f245050907fbab76c2e555491889 /arch/mips/cobalt/setup.c
parentcc50b67dcd84c6215232c0e1c95e24786e555782 (diff)
[MIPS] Cobalt: Split PCI codes from setup.c
It's removed #ifdef CONFIG_PCI/#endif from cobalt setup.c . Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cobalt/setup.c')
-rw-r--r--arch/mips/cobalt/setup.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index db0d83cf1d4e..d0dd81790f74 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -61,22 +61,6 @@ void __init plat_timer_setup(struct irqaction *irq)
61 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));
62} 62}
63 63
64extern struct pci_ops gt64111_pci_ops;
65
66static struct resource cobalt_mem_resource = {
67 .start = GT_DEF_PCI0_MEM0_BASE,
68 .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
69 .name = "PCI memory",
70 .flags = IORESOURCE_MEM
71};
72
73static struct resource cobalt_io_resource = {
74 .start = 0x1000,
75 .end = 0xffff,
76 .name = "PCI I/O",
77 .flags = IORESOURCE_IO
78};
79
80/* 64/*
81 * Cobalt doesn't have PS/2 keyboard/mouse interfaces, 65 * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
82 * keyboard conntroller is never used. 66 * keyboard conntroller is never used.
@@ -109,14 +93,6 @@ static struct resource cobalt_reserved_resources[] = {
109 }, 93 },
110}; 94};
111 95
112static struct pci_controller cobalt_pci_controller = {
113 .pci_ops = &gt64111_pci_ops,
114 .mem_resource = &cobalt_mem_resource,
115 .mem_offset = 0,
116 .io_resource = &cobalt_io_resource,
117 .io_offset = 0 - GT_DEF_PCI0_IO_BASE,
118};
119
120void __init plat_mem_setup(void) 96void __init plat_mem_setup(void)
121{ 97{
122 static struct uart_port uart; 98 static struct uart_port uart;
@@ -144,10 +120,6 @@ void __init plat_mem_setup(void)
144 120
145 printk("Cobalt board ID: %d\n", cobalt_board_id); 121 printk("Cobalt board ID: %d\n", cobalt_board_id);
146 122
147#ifdef CONFIG_PCI
148 register_pci_controller(&cobalt_pci_controller);
149#endif
150
151 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { 123 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
152#ifdef CONFIG_SERIAL_8250 124#ifdef CONFIG_SERIAL_8250
153 uart.line = 0; 125 uart.line = 0;