diff options
-rw-r--r-- | arch/mips/cobalt/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/lasat/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/atlas/atlas_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/sead/sead_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/sim/sim_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/momentum/jaguar_atx/ja-console.c | 2 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/common/platform.c | 4 | ||||
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip32/ip32-setup.c | 13 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/bamboo.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/bubinga.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ebony.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/luan.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/ocotea.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/xilinx_ml300.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/yucca.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/spruce.c | 2 | ||||
-rw-r--r-- | drivers/serial/m32r_sio.c | 2 | ||||
-rw-r--r-- | drivers/serial/sh-sci.c | 10 |
19 files changed, 27 insertions, 32 deletions
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index d358a118fa31..38c0c67d6a2a 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c | |||
@@ -139,7 +139,7 @@ void __init plat_setup(void) | |||
139 | uart.type = PORT_UNKNOWN; | 139 | uart.type = PORT_UNKNOWN; |
140 | uart.uartclk = 18432000; | 140 | uart.uartclk = 18432000; |
141 | uart.irq = COBALT_SERIAL_IRQ; | 141 | uart.irq = COBALT_SERIAL_IRQ; |
142 | uart.flags = STD_COM_FLAGS; | 142 | uart.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
143 | uart.iobase = 0xc800000; | 143 | uart.iobase = 0xc800000; |
144 | uart.iotype = UPIO_PORT; | 144 | uart.iotype = UPIO_PORT; |
145 | 145 | ||
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index cefcf738bc00..83eb08b7a072 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
@@ -134,7 +134,7 @@ void __init serial_init(void) | |||
134 | 134 | ||
135 | memset(&s, 0, sizeof(s)); | 135 | memset(&s, 0, sizeof(s)); |
136 | 136 | ||
137 | s.flags = STD_COM_FLAGS; | 137 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
138 | s.iotype = UPIO_MEM; | 138 | s.iotype = UPIO_MEM; |
139 | 139 | ||
140 | if (mips_machtype == MACH_LASAT_100) { | 140 | if (mips_machtype == MACH_LASAT_100) { |
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c index 2d4f3090fd86..873cf3141a31 100644 --- a/arch/mips/mips-boards/atlas/atlas_setup.c +++ b/arch/mips/mips-boards/atlas/atlas_setup.c | |||
@@ -82,7 +82,7 @@ static void __init serial_init(void) | |||
82 | #endif | 82 | #endif |
83 | s.irq = ATLASINT_UART; | 83 | s.irq = ATLASINT_UART; |
84 | s.uartclk = ATLAS_BASE_BAUD * 16; | 84 | s.uartclk = ATLAS_BASE_BAUD * 16; |
85 | s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; | 85 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ; |
86 | s.iotype = UPIO_PORT; | 86 | s.iotype = UPIO_PORT; |
87 | s.regshift = 3; | 87 | s.regshift = 3; |
88 | 88 | ||
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index a72ef29289b6..4266ce445174 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c | |||
@@ -71,7 +71,7 @@ static void __init serial_init(void) | |||
71 | #endif | 71 | #endif |
72 | s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; | 72 | s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; |
73 | s.uartclk = SEAD_BASE_BAUD * 16; | 73 | s.uartclk = SEAD_BASE_BAUD * 16; |
74 | s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; | 74 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ; |
75 | s.iotype = UPIO_PORT; | 75 | s.iotype = UPIO_PORT; |
76 | s.regshift = 3; | 76 | s.regshift = 3; |
77 | 77 | ||
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c index 87a14a731ae8..a2fd62997ca3 100644 --- a/arch/mips/mips-boards/sim/sim_setup.c +++ b/arch/mips/mips-boards/sim/sim_setup.c | |||
@@ -88,7 +88,7 @@ static void __init serial_init(void) | |||
88 | but poll for now */ | 88 | but poll for now */ |
89 | s.irq = 0; | 89 | s.irq = 0; |
90 | s.uartclk = BASE_BAUD * 16; | 90 | s.uartclk = BASE_BAUD * 16; |
91 | s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST; | 91 | s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
92 | s.iotype = UPIO_PORT; | 92 | s.iotype = UPIO_PORT; |
93 | s.regshift = 0; | 93 | s.regshift = 0; |
94 | s.timeout = 4; | 94 | s.timeout = 4; |
diff --git a/arch/mips/momentum/jaguar_atx/ja-console.c b/arch/mips/momentum/jaguar_atx/ja-console.c index da6e1ed34db1..2292d0ec47fc 100644 --- a/arch/mips/momentum/jaguar_atx/ja-console.c +++ b/arch/mips/momentum/jaguar_atx/ja-console.c | |||
@@ -93,7 +93,7 @@ static void inline ja_console_probe(void) | |||
93 | up.uartclk = JAGUAR_ATX_UART_CLK; | 93 | up.uartclk = JAGUAR_ATX_UART_CLK; |
94 | up.regshift = 2; | 94 | up.regshift = 2; |
95 | up.iotype = UPIO_MEM; | 95 | up.iotype = UPIO_MEM; |
96 | up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 96 | up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
97 | up.line = 0; | 97 | up.line = 0; |
98 | 98 | ||
99 | if (early_serial_setup(&up)) | 99 | if (early_serial_setup(&up)) |
diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c index 35be6db4245f..a592260fd673 100644 --- a/arch/mips/philips/pnx8550/common/platform.c +++ b/arch/mips/philips/pnx8550/common/platform.c | |||
@@ -73,7 +73,7 @@ struct ip3106_port ip3106_ports[] = { | |||
73 | .uartclk = 3692300, | 73 | .uartclk = 3692300, |
74 | .fifosize = 16, | 74 | .fifosize = 16, |
75 | .ops = &ip3106_pops, | 75 | .ops = &ip3106_pops, |
76 | .flags = ASYNC_BOOT_AUTOCONF, | 76 | .flags = UPF_BOOT_AUTOCONF, |
77 | .line = 0, | 77 | .line = 0, |
78 | }, | 78 | }, |
79 | }, | 79 | }, |
@@ -87,7 +87,7 @@ struct ip3106_port ip3106_ports[] = { | |||
87 | .uartclk = 3692300, | 87 | .uartclk = 3692300, |
88 | .fifosize = 16, | 88 | .fifosize = 16, |
89 | .ops = &ip3106_pops, | 89 | .ops = &ip3106_pops, |
90 | .flags = ASYNC_BOOT_AUTOCONF, | 90 | .flags = UPF_BOOT_AUTOCONF, |
91 | .line = 1, | 91 | .line = 1, |
92 | }, | 92 | }, |
93 | }, | 93 | }, |
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c index 059755b5ed57..8bce711575de 100644 --- a/arch/mips/pmc-sierra/yosemite/setup.c +++ b/arch/mips/pmc-sierra/yosemite/setup.c | |||
@@ -185,7 +185,7 @@ static void __init py_uart_setup(void) | |||
185 | up.uartclk = TITAN_UART_CLK; | 185 | up.uartclk = TITAN_UART_CLK; |
186 | up.regshift = 0; | 186 | up.regshift = 0; |
187 | up.iotype = UPIO_MEM; | 187 | up.iotype = UPIO_MEM; |
188 | up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 188 | up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
189 | up.line = 0; | 189 | up.line = 0; |
190 | 190 | ||
191 | if (early_serial_setup(&up)) | 191 | if (early_serial_setup(&up)) |
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c index d10a269aeae1..2c38770b1e1b 100644 --- a/arch/mips/sgi-ip32/ip32-setup.c +++ b/arch/mips/sgi-ip32/ip32-setup.c | |||
@@ -66,11 +66,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) | |||
66 | #include <linux/tty.h> | 66 | #include <linux/tty.h> |
67 | #include <linux/serial.h> | 67 | #include <linux/serial.h> |
68 | #include <linux/serial_core.h> | 68 | #include <linux/serial_core.h> |
69 | extern int early_serial_setup(struct uart_port *port); | ||
70 | |||
71 | #define STD_COM_FLAGS (ASYNC_SKIP_TEST) | ||
72 | #define BASE_BAUD (1843200 / 16) | ||
73 | |||
74 | #endif /* CONFIG_SERIAL_8250 */ | 69 | #endif /* CONFIG_SERIAL_8250 */ |
75 | 70 | ||
76 | /* An arbitrary time; this can be decreased if reliability looks good */ | 71 | /* An arbitrary time; this can be decreased if reliability looks good */ |
@@ -110,8 +105,8 @@ void __init plat_setup(void) | |||
110 | o2_serial[0].type = PORT_16550A; | 105 | o2_serial[0].type = PORT_16550A; |
111 | o2_serial[0].line = 0; | 106 | o2_serial[0].line = 0; |
112 | o2_serial[0].irq = MACEISA_SERIAL1_IRQ; | 107 | o2_serial[0].irq = MACEISA_SERIAL1_IRQ; |
113 | o2_serial[0].flags = STD_COM_FLAGS; | 108 | o2_serial[0].flags = UPF_SKIP_TEST; |
114 | o2_serial[0].uartclk = BASE_BAUD * 16; | 109 | o2_serial[0].uartclk = 1843200; |
115 | o2_serial[0].iotype = UPIO_MEM; | 110 | o2_serial[0].iotype = UPIO_MEM; |
116 | o2_serial[0].membase = (char *)&mace->isa.serial1; | 111 | o2_serial[0].membase = (char *)&mace->isa.serial1; |
117 | o2_serial[0].fifosize = 14; | 112 | o2_serial[0].fifosize = 14; |
@@ -121,8 +116,8 @@ void __init plat_setup(void) | |||
121 | o2_serial[1].type = PORT_16550A; | 116 | o2_serial[1].type = PORT_16550A; |
122 | o2_serial[1].line = 1; | 117 | o2_serial[1].line = 1; |
123 | o2_serial[1].irq = MACEISA_SERIAL2_IRQ; | 118 | o2_serial[1].irq = MACEISA_SERIAL2_IRQ; |
124 | o2_serial[1].flags = STD_COM_FLAGS; | 119 | o2_serial[1].flags = UPF_SKIP_TEST; |
125 | o2_serial[1].uartclk = BASE_BAUD * 16; | 120 | o2_serial[1].uartclk = 1843200; |
126 | o2_serial[1].iotype = UPIO_MEM; | 121 | o2_serial[1].iotype = UPIO_MEM; |
127 | o2_serial[1].membase = (char *)&mace->isa.serial2; | 122 | o2_serial[1].membase = (char *)&mace->isa.serial2; |
128 | o2_serial[1].fifosize = 14; | 123 | o2_serial[1].fifosize = 14; |
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c index c371d54d2552..0ec53f049338 100644 --- a/arch/ppc/platforms/4xx/bamboo.c +++ b/arch/ppc/platforms/4xx/bamboo.c | |||
@@ -333,7 +333,7 @@ bamboo_early_serial_map(void) | |||
333 | port.uartclk = clocks.uart0; | 333 | port.uartclk = clocks.uart0; |
334 | port.regshift = 0; | 334 | port.regshift = 0; |
335 | port.iotype = UPIO_MEM; | 335 | port.iotype = UPIO_MEM; |
336 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 336 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
337 | port.line = 0; | 337 | port.line = 0; |
338 | 338 | ||
339 | if (early_serial_setup(&port) != 0) { | 339 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c index 0fe8da1401da..ce48a4f08cbb 100644 --- a/arch/ppc/platforms/4xx/bubinga.c +++ b/arch/ppc/platforms/4xx/bubinga.c | |||
@@ -98,7 +98,7 @@ bubinga_early_serial_map(void) | |||
98 | port.uartclk = uart_clock; | 98 | port.uartclk = uart_clock; |
99 | port.regshift = 0; | 99 | port.regshift = 0; |
100 | port.iotype = UPIO_MEM; | 100 | port.iotype = UPIO_MEM; |
101 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 101 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
102 | port.line = 0; | 102 | port.line = 0; |
103 | 103 | ||
104 | if (early_serial_setup(&port) != 0) { | 104 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c index 352b76c08987..9a828b623417 100644 --- a/arch/ppc/platforms/4xx/ebony.c +++ b/arch/ppc/platforms/4xx/ebony.c | |||
@@ -226,7 +226,7 @@ ebony_early_serial_map(void) | |||
226 | port.uartclk = clocks.uart0; | 226 | port.uartclk = clocks.uart0; |
227 | port.regshift = 0; | 227 | port.regshift = 0; |
228 | port.iotype = UPIO_MEM; | 228 | port.iotype = UPIO_MEM; |
229 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 229 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
230 | port.line = 0; | 230 | port.line = 0; |
231 | 231 | ||
232 | if (early_serial_setup(&port) != 0) { | 232 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c index a94683a72a1e..21d29132aebd 100644 --- a/arch/ppc/platforms/4xx/luan.c +++ b/arch/ppc/platforms/4xx/luan.c | |||
@@ -280,7 +280,7 @@ luan_early_serial_map(void) | |||
280 | port.uartclk = clocks.uart0; | 280 | port.uartclk = clocks.uart0; |
281 | port.regshift = 0; | 281 | port.regshift = 0; |
282 | port.iotype = UPIO_MEM; | 282 | port.iotype = UPIO_MEM; |
283 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 283 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
284 | port.line = 0; | 284 | port.line = 0; |
285 | 285 | ||
286 | if (early_serial_setup(&port) != 0) { | 286 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index de916bb4617c..4f355b6acab2 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
@@ -249,7 +249,7 @@ ocotea_early_serial_map(void) | |||
249 | port.uartclk = clocks.uart0; | 249 | port.uartclk = clocks.uart0; |
250 | port.regshift = 0; | 250 | port.regshift = 0; |
251 | port.iotype = UPIO_MEM; | 251 | port.iotype = UPIO_MEM; |
252 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 252 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
253 | port.line = 0; | 253 | port.line = 0; |
254 | 254 | ||
255 | if (early_serial_setup(&port) != 0) { | 255 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c index 3f820229071e..e90d97f64f76 100644 --- a/arch/ppc/platforms/4xx/xilinx_ml300.c +++ b/arch/ppc/platforms/4xx/xilinx_ml300.c | |||
@@ -96,7 +96,7 @@ ml300_early_serial_map(void) | |||
96 | port.uartclk = old_ports[i].baud_base * 16; | 96 | port.uartclk = old_ports[i].baud_base * 16; |
97 | port.regshift = old_ports[i].iomem_reg_shift; | 97 | port.regshift = old_ports[i].iomem_reg_shift; |
98 | port.iotype = UPIO_MEM; | 98 | port.iotype = UPIO_MEM; |
99 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 99 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
100 | port.line = i; | 100 | port.line = i; |
101 | 101 | ||
102 | if (early_serial_setup(&port) != 0) { | 102 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c index 2b84fc6247d3..b065b8babcd3 100644 --- a/arch/ppc/platforms/4xx/yucca.c +++ b/arch/ppc/platforms/4xx/yucca.c | |||
@@ -306,7 +306,7 @@ yucca_early_serial_map(void) | |||
306 | port.uartclk = clocks.uart0; | 306 | port.uartclk = clocks.uart0; |
307 | port.regshift = 0; | 307 | port.regshift = 0; |
308 | port.iotype = UPIO_MEM; | 308 | port.iotype = UPIO_MEM; |
309 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | 309 | port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; |
310 | port.line = 0; | 310 | port.line = 0; |
311 | 311 | ||
312 | if (early_serial_setup(&port) != 0) { | 312 | if (early_serial_setup(&port) != 0) { |
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c index 510182ea9d28..69e1de7971f2 100644 --- a/arch/ppc/platforms/spruce.c +++ b/arch/ppc/platforms/spruce.c | |||
@@ -176,7 +176,7 @@ spruce_early_serial_map(void) | |||
176 | memset(&serial_req, 0, sizeof(serial_req)); | 176 | memset(&serial_req, 0, sizeof(serial_req)); |
177 | serial_req.uartclk = uart_clk; | 177 | serial_req.uartclk = uart_clk; |
178 | serial_req.irq = UART0_INT; | 178 | serial_req.irq = UART0_INT; |
179 | serial_req.flags = ASYNC_BOOT_AUTOCONF; | 179 | serial_req.flags = UPF_BOOT_AUTOCONF; |
180 | serial_req.iotype = UPIO_MEM; | 180 | serial_req.iotype = UPIO_MEM; |
181 | serial_req.membase = (u_char *)UART0_IO_BASE; | 181 | serial_req.membase = (u_char *)UART0_IO_BASE; |
182 | serial_req.regshift = 0; | 182 | serial_req.regshift = 0; |
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index b48066a64a7d..242a04104393 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -80,7 +80,7 @@ | |||
80 | #include <asm/serial.h> | 80 | #include <asm/serial.h> |
81 | 81 | ||
82 | /* Standard COM flags */ | 82 | /* Standard COM flags */ |
83 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) | 83 | #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) |
84 | 84 | ||
85 | /* | 85 | /* |
86 | * SERIAL_PORT_DFNS tells us about built-in ports that have no | 86 | * SERIAL_PORT_DFNS tells us about built-in ports that have no |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index c903349bb40a..44f6bf79bbe1 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -1471,7 +1471,7 @@ static struct sci_port sci_ports[] = { | |||
1471 | .iotype = UPIO_MEM, | 1471 | .iotype = UPIO_MEM, |
1472 | .irq = 61, | 1472 | .irq = 61, |
1473 | .ops = &sci_uart_ops, | 1473 | .ops = &sci_uart_ops, |
1474 | .flags = ASYNC_BOOT_AUTOCONF, | 1474 | .flags = UPF_BOOT_AUTOCONF, |
1475 | .line = 0, | 1475 | .line = 0, |
1476 | }, | 1476 | }, |
1477 | .type = PORT_SCIF, | 1477 | .type = PORT_SCIF, |
@@ -1485,7 +1485,7 @@ static struct sci_port sci_ports[] = { | |||
1485 | .iotype = UPIO_MEM, | 1485 | .iotype = UPIO_MEM, |
1486 | .irq = 62, | 1486 | .irq = 62, |
1487 | .ops = &sci_uart_ops, | 1487 | .ops = &sci_uart_ops, |
1488 | .flags = ASYNC_BOOT_AUTOCONF, | 1488 | .flags = UPF_BOOT_AUTOCONF, |
1489 | .line = 1, | 1489 | .line = 1, |
1490 | }, | 1490 | }, |
1491 | .type = PORT_SCIF, | 1491 | .type = PORT_SCIF, |
@@ -1499,7 +1499,7 @@ static struct sci_port sci_ports[] = { | |||
1499 | .iotype = UPIO_MEM, | 1499 | .iotype = UPIO_MEM, |
1500 | .irq = 63, | 1500 | .irq = 63, |
1501 | .ops = &sci_uart_ops, | 1501 | .ops = &sci_uart_ops, |
1502 | .flags = ASYNC_BOOT_AUTOCONF, | 1502 | .flags = UPF_BOOT_AUTOCONF, |
1503 | .line = 2, | 1503 | .line = 2, |
1504 | }, | 1504 | }, |
1505 | .type = PORT_SCIF, | 1505 | .type = PORT_SCIF, |
@@ -1514,7 +1514,7 @@ static struct sci_port sci_ports[] = { | |||
1514 | .iotype = UPIO_MEM, | 1514 | .iotype = UPIO_MEM, |
1515 | .irq = 43, | 1515 | .irq = 43, |
1516 | .ops = &sci_uart_ops, | 1516 | .ops = &sci_uart_ops, |
1517 | .flags = ASYNC_BOOT_AUTOCONF, | 1517 | .flags = UPF_BOOT_AUTOCONF, |
1518 | .line = 0, | 1518 | .line = 0, |
1519 | }, | 1519 | }, |
1520 | .type = PORT_SCIF, | 1520 | .type = PORT_SCIF, |
@@ -1528,7 +1528,7 @@ static struct sci_port sci_ports[] = { | |||
1528 | .iotype = UPIO_MEM, | 1528 | .iotype = UPIO_MEM, |
1529 | .irq = 79, | 1529 | .irq = 79, |
1530 | .ops = &sci_uart_ops, | 1530 | .ops = &sci_uart_ops, |
1531 | .flags = ASYNC_BOOT_AUTOCONF, | 1531 | .flags = UPF_BOOT_AUTOCONF, |
1532 | .line = 1, | 1532 | .line = 1, |
1533 | }, | 1533 | }, |
1534 | .type = PORT_SCIF, | 1534 | .type = PORT_SCIF, |