Commit 59a675b2 authored by Russell King's avatar Russell King Committed by Russell King

[SERIAL] uart_port flags member should use UPF_*

Convert usage of ASYNC_* to UPF_*.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9b4a1617
...@@ -139,7 +139,7 @@ void __init plat_setup(void) ...@@ -139,7 +139,7 @@ void __init plat_setup(void)
uart.type = PORT_UNKNOWN; uart.type = PORT_UNKNOWN;
uart.uartclk = 18432000; uart.uartclk = 18432000;
uart.irq = COBALT_SERIAL_IRQ; uart.irq = COBALT_SERIAL_IRQ;
uart.flags = STD_COM_FLAGS; uart.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
uart.iobase = 0xc800000; uart.iobase = 0xc800000;
uart.iotype = UPIO_PORT; uart.iotype = UPIO_PORT;
......
...@@ -134,7 +134,7 @@ void __init serial_init(void) ...@@ -134,7 +134,7 @@ void __init serial_init(void)
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
s.flags = STD_COM_FLAGS; s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
s.iotype = UPIO_MEM; s.iotype = UPIO_MEM;
if (mips_machtype == MACH_LASAT_100) { if (mips_machtype == MACH_LASAT_100) {
......
...@@ -82,7 +82,7 @@ static void __init serial_init(void) ...@@ -82,7 +82,7 @@ static void __init serial_init(void)
#endif #endif
s.irq = ATLASINT_UART; s.irq = ATLASINT_UART;
s.uartclk = ATLAS_BASE_BAUD * 16; s.uartclk = ATLAS_BASE_BAUD * 16;
s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
s.iotype = UPIO_PORT; s.iotype = UPIO_PORT;
s.regshift = 3; s.regshift = 3;
......
...@@ -71,7 +71,7 @@ static void __init serial_init(void) ...@@ -71,7 +71,7 @@ static void __init serial_init(void)
#endif #endif
s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
s.uartclk = SEAD_BASE_BAUD * 16; s.uartclk = SEAD_BASE_BAUD * 16;
s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
s.iotype = UPIO_PORT; s.iotype = UPIO_PORT;
s.regshift = 3; s.regshift = 3;
......
...@@ -88,7 +88,7 @@ static void __init serial_init(void) ...@@ -88,7 +88,7 @@ static void __init serial_init(void)
but poll for now */ but poll for now */
s.irq = 0; s.irq = 0;
s.uartclk = BASE_BAUD * 16; s.uartclk = BASE_BAUD * 16;
s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST; s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
s.iotype = UPIO_PORT; s.iotype = UPIO_PORT;
s.regshift = 0; s.regshift = 0;
s.timeout = 4; s.timeout = 4;
......
...@@ -93,7 +93,7 @@ static void inline ja_console_probe(void) ...@@ -93,7 +93,7 @@ static void inline ja_console_probe(void)
up.uartclk = JAGUAR_ATX_UART_CLK; up.uartclk = JAGUAR_ATX_UART_CLK;
up.regshift = 2; up.regshift = 2;
up.iotype = UPIO_MEM; up.iotype = UPIO_MEM;
up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
up.line = 0; up.line = 0;
if (early_serial_setup(&up)) if (early_serial_setup(&up))
......
...@@ -73,7 +73,7 @@ struct ip3106_port ip3106_ports[] = { ...@@ -73,7 +73,7 @@ struct ip3106_port ip3106_ports[] = {
.uartclk = 3692300, .uartclk = 3692300,
.fifosize = 16, .fifosize = 16,
.ops = &ip3106_pops, .ops = &ip3106_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
}, },
...@@ -87,7 +87,7 @@ struct ip3106_port ip3106_ports[] = { ...@@ -87,7 +87,7 @@ struct ip3106_port ip3106_ports[] = {
.uartclk = 3692300, .uartclk = 3692300,
.fifosize = 16, .fifosize = 16,
.ops = &ip3106_pops, .ops = &ip3106_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
}, },
......
...@@ -185,7 +185,7 @@ static void __init py_uart_setup(void) ...@@ -185,7 +185,7 @@ static void __init py_uart_setup(void)
up.uartclk = TITAN_UART_CLK; up.uartclk = TITAN_UART_CLK;
up.regshift = 0; up.regshift = 0;
up.iotype = UPIO_MEM; up.iotype = UPIO_MEM;
up.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; up.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
up.line = 0; up.line = 0;
if (early_serial_setup(&up)) if (early_serial_setup(&up))
......
...@@ -66,11 +66,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) ...@@ -66,11 +66,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
extern int early_serial_setup(struct uart_port *port);
#define STD_COM_FLAGS (ASYNC_SKIP_TEST)
#define BASE_BAUD (1843200 / 16)
#endif /* CONFIG_SERIAL_8250 */ #endif /* CONFIG_SERIAL_8250 */
/* An arbitrary time; this can be decreased if reliability looks good */ /* An arbitrary time; this can be decreased if reliability looks good */
...@@ -110,8 +105,8 @@ void __init plat_setup(void) ...@@ -110,8 +105,8 @@ void __init plat_setup(void)
o2_serial[0].type = PORT_16550A; o2_serial[0].type = PORT_16550A;
o2_serial[0].line = 0; o2_serial[0].line = 0;
o2_serial[0].irq = MACEISA_SERIAL1_IRQ; o2_serial[0].irq = MACEISA_SERIAL1_IRQ;
o2_serial[0].flags = STD_COM_FLAGS; o2_serial[0].flags = UPF_SKIP_TEST;
o2_serial[0].uartclk = BASE_BAUD * 16; o2_serial[0].uartclk = 1843200;
o2_serial[0].iotype = UPIO_MEM; o2_serial[0].iotype = UPIO_MEM;
o2_serial[0].membase = (char *)&mace->isa.serial1; o2_serial[0].membase = (char *)&mace->isa.serial1;
o2_serial[0].fifosize = 14; o2_serial[0].fifosize = 14;
...@@ -121,8 +116,8 @@ void __init plat_setup(void) ...@@ -121,8 +116,8 @@ void __init plat_setup(void)
o2_serial[1].type = PORT_16550A; o2_serial[1].type = PORT_16550A;
o2_serial[1].line = 1; o2_serial[1].line = 1;
o2_serial[1].irq = MACEISA_SERIAL2_IRQ; o2_serial[1].irq = MACEISA_SERIAL2_IRQ;
o2_serial[1].flags = STD_COM_FLAGS; o2_serial[1].flags = UPF_SKIP_TEST;
o2_serial[1].uartclk = BASE_BAUD * 16; o2_serial[1].uartclk = 1843200;
o2_serial[1].iotype = UPIO_MEM; o2_serial[1].iotype = UPIO_MEM;
o2_serial[1].membase = (char *)&mace->isa.serial2; o2_serial[1].membase = (char *)&mace->isa.serial2;
o2_serial[1].fifosize = 14; o2_serial[1].fifosize = 14;
......
...@@ -333,7 +333,7 @@ bamboo_early_serial_map(void) ...@@ -333,7 +333,7 @@ bamboo_early_serial_map(void)
port.uartclk = clocks.uart0; port.uartclk = clocks.uart0;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -98,7 +98,7 @@ bubinga_early_serial_map(void) ...@@ -98,7 +98,7 @@ bubinga_early_serial_map(void)
port.uartclk = uart_clock; port.uartclk = uart_clock;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -226,7 +226,7 @@ ebony_early_serial_map(void) ...@@ -226,7 +226,7 @@ ebony_early_serial_map(void)
port.uartclk = clocks.uart0; port.uartclk = clocks.uart0;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -280,7 +280,7 @@ luan_early_serial_map(void) ...@@ -280,7 +280,7 @@ luan_early_serial_map(void)
port.uartclk = clocks.uart0; port.uartclk = clocks.uart0;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -249,7 +249,7 @@ ocotea_early_serial_map(void) ...@@ -249,7 +249,7 @@ ocotea_early_serial_map(void)
port.uartclk = clocks.uart0; port.uartclk = clocks.uart0;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -96,7 +96,7 @@ ml300_early_serial_map(void) ...@@ -96,7 +96,7 @@ ml300_early_serial_map(void)
port.uartclk = old_ports[i].baud_base * 16; port.uartclk = old_ports[i].baud_base * 16;
port.regshift = old_ports[i].iomem_reg_shift; port.regshift = old_ports[i].iomem_reg_shift;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = i; port.line = i;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -306,7 +306,7 @@ yucca_early_serial_map(void) ...@@ -306,7 +306,7 @@ yucca_early_serial_map(void)
port.uartclk = clocks.uart0; port.uartclk = clocks.uart0;
port.regshift = 0; port.regshift = 0;
port.iotype = UPIO_MEM; port.iotype = UPIO_MEM;
port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.line = 0; port.line = 0;
if (early_serial_setup(&port) != 0) { if (early_serial_setup(&port) != 0) {
......
...@@ -176,7 +176,7 @@ spruce_early_serial_map(void) ...@@ -176,7 +176,7 @@ spruce_early_serial_map(void)
memset(&serial_req, 0, sizeof(serial_req)); memset(&serial_req, 0, sizeof(serial_req));
serial_req.uartclk = uart_clk; serial_req.uartclk = uart_clk;
serial_req.irq = UART0_INT; serial_req.irq = UART0_INT;
serial_req.flags = ASYNC_BOOT_AUTOCONF; serial_req.flags = UPF_BOOT_AUTOCONF;
serial_req.iotype = UPIO_MEM; serial_req.iotype = UPIO_MEM;
serial_req.membase = (u_char *)UART0_IO_BASE; serial_req.membase = (u_char *)UART0_IO_BASE;
serial_req.regshift = 0; serial_req.regshift = 0;
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
#include <asm/serial.h> #include <asm/serial.h>
/* Standard COM flags */ /* Standard COM flags */
#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
/* /*
* SERIAL_PORT_DFNS tells us about built-in ports that have no * SERIAL_PORT_DFNS tells us about built-in ports that have no
......
...@@ -1471,7 +1471,7 @@ static struct sci_port sci_ports[] = { ...@@ -1471,7 +1471,7 @@ static struct sci_port sci_ports[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.irq = 61, .irq = 61,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1485,7 +1485,7 @@ static struct sci_port sci_ports[] = { ...@@ -1485,7 +1485,7 @@ static struct sci_port sci_ports[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.irq = 62, .irq = 62,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1499,7 +1499,7 @@ static struct sci_port sci_ports[] = { ...@@ -1499,7 +1499,7 @@ static struct sci_port sci_ports[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.irq = 63, .irq = 63,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 2, .line = 2,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1514,7 +1514,7 @@ static struct sci_port sci_ports[] = { ...@@ -1514,7 +1514,7 @@ static struct sci_port sci_ports[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.irq = 43, .irq = 43,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1528,7 +1528,7 @@ static struct sci_port sci_ports[] = { ...@@ -1528,7 +1528,7 @@ static struct sci_port sci_ports[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.irq = 79, .irq = 79,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment