diff options
Diffstat (limited to 'arch/mips/cobalt/setup.c')
-rw-r--r-- | arch/mips/cobalt/setup.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index d0dd81790f74..7abe45e78425 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -10,11 +10,8 @@ | |||
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <linux/pci.h> | ||
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
16 | #include <linux/serial.h> | ||
17 | #include <linux/serial_core.h> | ||
18 | 15 | ||
19 | #include <asm/bootinfo.h> | 16 | #include <asm/bootinfo.h> |
20 | #include <asm/time.h> | 17 | #include <asm/time.h> |
@@ -27,9 +24,6 @@ | |||
27 | extern void cobalt_machine_restart(char *command); | 24 | extern void cobalt_machine_restart(char *command); |
28 | extern void cobalt_machine_halt(void); | 25 | extern void cobalt_machine_halt(void); |
29 | extern void cobalt_machine_power_off(void); | 26 | extern void cobalt_machine_power_off(void); |
30 | extern void cobalt_early_console(void); | ||
31 | |||
32 | int cobalt_board_id; | ||
33 | 27 | ||
34 | const char *get_system_type(void) | 28 | const char *get_system_type(void) |
35 | { | 29 | { |
@@ -95,8 +89,6 @@ static struct resource cobalt_reserved_resources[] = { | |||
95 | 89 | ||
96 | void __init plat_mem_setup(void) | 90 | void __init plat_mem_setup(void) |
97 | { | 91 | { |
98 | static struct uart_port uart; | ||
99 | unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0); | ||
100 | int i; | 92 | int i; |
101 | 93 | ||
102 | _machine_restart = cobalt_machine_restart; | 94 | _machine_restart = cobalt_machine_restart; |
@@ -111,29 +103,6 @@ void __init plat_mem_setup(void) | |||
111 | /* These resources have been reserved by VIA SuperI/O chip. */ | 103 | /* These resources have been reserved by VIA SuperI/O chip. */ |
112 | for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++) | 104 | for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++) |
113 | request_resource(&ioport_resource, cobalt_reserved_resources + i); | 105 | request_resource(&ioport_resource, cobalt_reserved_resources + i); |
114 | |||
115 | /* Read the cobalt id register out of the PCI config space */ | ||
116 | PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3)); | ||
117 | cobalt_board_id = GT_READ(GT_PCI0_CFGDATA_OFS); | ||
118 | cobalt_board_id >>= ((VIA_COBALT_BRD_ID_REG & 3) * 8); | ||
119 | cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id); | ||
120 | |||
121 | printk("Cobalt board ID: %d\n", cobalt_board_id); | ||
122 | |||
123 | if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { | ||
124 | #ifdef CONFIG_SERIAL_8250 | ||
125 | uart.line = 0; | ||
126 | uart.type = PORT_UNKNOWN; | ||
127 | uart.uartclk = 18432000; | ||
128 | uart.irq = COBALT_SERIAL_IRQ; | ||
129 | uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF | | ||
130 | UPF_SKIP_TEST; | ||
131 | uart.iotype = UPIO_MEM; | ||
132 | uart.mapbase = 0x1c800000; | ||
133 | |||
134 | early_serial_setup(&uart); | ||
135 | #endif | ||
136 | } | ||
137 | } | 106 | } |
138 | 107 | ||
139 | /* | 108 | /* |