diff options
Diffstat (limited to 'arch/mips/sgi-ip32/ip32-setup.c')
-rw-r--r-- | arch/mips/sgi-ip32/ip32-setup.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c index 57708fe28bd7..bbba066cb405 100644 --- a/arch/mips/sgi-ip32/ip32-setup.c +++ b/arch/mips/sgi-ip32/ip32-setup.c | |||
@@ -62,12 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) | |||
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #ifdef CONFIG_SERIAL_8250 | ||
66 | #include <linux/tty.h> | ||
67 | #include <linux/serial.h> | ||
68 | #include <linux/serial_core.h> | ||
69 | #endif /* CONFIG_SERIAL_8250 */ | ||
70 | |||
71 | /* An arbitrary time; this can be decreased if reliability looks good */ | 65 | /* An arbitrary time; this can be decreased if reliability looks good */ |
72 | #define WAIT_MS 10 | 66 | #define WAIT_MS 10 |
73 | 67 | ||
@@ -96,36 +90,6 @@ void __init plat_mem_setup(void) | |||
96 | 90 | ||
97 | board_time_init = ip32_time_init; | 91 | board_time_init = ip32_time_init; |
98 | 92 | ||
99 | #ifdef CONFIG_SERIAL_8250 | ||
100 | { | ||
101 | static struct uart_port o2_serial[2]; | ||
102 | |||
103 | memset(o2_serial, 0, sizeof(o2_serial)); | ||
104 | o2_serial[0].type = PORT_16550A; | ||
105 | o2_serial[0].line = 0; | ||
106 | o2_serial[0].irq = MACEISA_SERIAL1_IRQ; | ||
107 | o2_serial[0].flags = UPF_SKIP_TEST; | ||
108 | o2_serial[0].uartclk = 1843200; | ||
109 | o2_serial[0].iotype = UPIO_MEM; | ||
110 | o2_serial[0].membase = (char *)&mace->isa.serial1; | ||
111 | o2_serial[0].fifosize = 14; | ||
112 | /* How much to shift register offset by. Each UART register | ||
113 | * is replicated over 256 byte space */ | ||
114 | o2_serial[0].regshift = 8; | ||
115 | o2_serial[1].type = PORT_16550A; | ||
116 | o2_serial[1].line = 1; | ||
117 | o2_serial[1].irq = MACEISA_SERIAL2_IRQ; | ||
118 | o2_serial[1].flags = UPF_SKIP_TEST; | ||
119 | o2_serial[1].uartclk = 1843200; | ||
120 | o2_serial[1].iotype = UPIO_MEM; | ||
121 | o2_serial[1].membase = (char *)&mace->isa.serial2; | ||
122 | o2_serial[1].fifosize = 14; | ||
123 | o2_serial[1].regshift = 8; | ||
124 | |||
125 | early_serial_setup(&o2_serial[0]); | ||
126 | early_serial_setup(&o2_serial[1]); | ||
127 | } | ||
128 | #endif | ||
129 | #ifdef CONFIG_SGI_O2MACE_ETH | 93 | #ifdef CONFIG_SGI_O2MACE_ETH |
130 | { | 94 | { |
131 | char *mac = ArcGetEnvironmentVariable("eaddr"); | 95 | char *mac = ArcGetEnvironmentVariable("eaddr"); |