Skip to content

L
linux
Commit ce8337cb authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[SERIAL] Don't use ASYNC_ constants with the uart_port structure 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f91a3715
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 68 deletions
drivers/serial/21285.c
View file @ ce8337cb
...@@ -366,7 +366,7 @@ static struct uart_port serial21285_port = { ...@@ -366,7 +366,7 @@ static struct uart_port serial21285_port = {
.irq = NO_IRQ, .irq = NO_IRQ,
.fifosize = 16, .fifosize = 16,
.ops = &serial21285_ops, .ops = &serial21285_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
}; };
static void serial21285_setup_ports(void) static void serial21285_setup_ports(void)
......
drivers/serial/amba-pl010.c
View file @ ce8337cb
...@@ -566,7 +566,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { ...@@ -566,7 +566,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
.uartclk = 14745600, .uartclk = 14745600,
.fifosize = 16, .fifosize = 16,
.ops = &amba_pl010_pops, .ops = &amba_pl010_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.dtr_mask = 1 << 5, .dtr_mask = 1 << 5,
...@@ -581,7 +581,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { ...@@ -581,7 +581,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
.uartclk = 14745600, .uartclk = 14745600,
.fifosize = 16, .fifosize = 16,
.ops = &amba_pl010_pops, .ops = &amba_pl010_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
.dtr_mask = 1 << 7, .dtr_mask = 1 << 7,
......
drivers/serial/clps711x.c
View file @ ce8337cb
...@@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = { ...@@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
.fifosize = 16, .fifosize = 16,
.ops = &clps711x_pops, .ops = &clps711x_pops,
.line = 0, .line = 0,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
}, },
{ {
.iobase = SYSCON2, .iobase = SYSCON2,
...@@ -419,7 +419,7 @@ static struct uart_port clps711x_ports[UART_NR] = { ...@@ -419,7 +419,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
.fifosize = 16, .fifosize = 16,
.ops = &clps711x_pops, .ops = &clps711x_pops,
.line = 1, .line = 1,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
} }
}; };
......
drivers/serial/imx.c
View file @ ce8337cb
...@@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = { ...@@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = {
.irq = UART1_MINT_RX, .irq = UART1_MINT_RX,
.uartclk = 16000000, .uartclk = 16000000,
.fifosize = 8, .fifosize = 8,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops, .ops = &imx_pops,
.line = 0, .line = 0,
}, },
...@@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = { ...@@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = {
.irq = UART2_MINT_RX, .irq = UART2_MINT_RX,
.uartclk = 16000000, .uartclk = 16000000,
.fifosize = 8, .fifosize = 8,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.ops = &imx_pops, .ops = &imx_pops,
.line = 1, .line = 1,
}, },
......
drivers/serial/sa1100.c
View file @ ce8337cb
...@@ -665,21 +665,21 @@ void __init sa1100_register_uart(int idx, int port) ...@@ -665,21 +665,21 @@ void __init sa1100_register_uart(int idx, int port)
sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0; sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0;
sa1100_ports[idx].port.mapbase = _Ser1UTCR0; sa1100_ports[idx].port.mapbase = _Ser1UTCR0;
sa1100_ports[idx].port.irq = IRQ_Ser1UART; sa1100_ports[idx].port.irq = IRQ_Ser1UART;
sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
break; break;
case 2: case 2:
sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0; sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0;
sa1100_ports[idx].port.mapbase = _Ser2UTCR0; sa1100_ports[idx].port.mapbase = _Ser2UTCR0;
sa1100_ports[idx].port.irq = IRQ_Ser2ICP; sa1100_ports[idx].port.irq = IRQ_Ser2ICP;
sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
break; break;
case 3: case 3:
sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0; sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0;
sa1100_ports[idx].port.mapbase = _Ser3UTCR0; sa1100_ports[idx].port.mapbase = _Ser3UTCR0;
sa1100_ports[idx].port.irq = IRQ_Ser3UART; sa1100_ports[idx].port.irq = IRQ_Ser3UART;
sa1100_ports[idx].port.flags = ASYNC_BOOT_AUTOCONF; sa1100_ports[idx].port.flags = UPF_BOOT_AUTOCONF;
break; break;
default: default:
......
drivers/serial/serial_lh7a40x.c
View file @ ce8337cb
...@@ -506,7 +506,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { ...@@ -506,7 +506,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.uartclk = 14745600/2, .uartclk = 14745600/2,
.fifosize = 16, .fifosize = 16,
.ops = &lh7a40x_uart_ops, .ops = &lh7a40x_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
}, },
...@@ -519,7 +519,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { ...@@ -519,7 +519,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.uartclk = 14745600/2, .uartclk = 14745600/2,
.fifosize = 16, .fifosize = 16,
.ops = &lh7a40x_uart_ops, .ops = &lh7a40x_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
}, },
...@@ -532,7 +532,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { ...@@ -532,7 +532,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.uartclk = 14745600/2, .uartclk = 14745600/2,
.fifosize = 16, .fifosize = 16,
.ops = &lh7a40x_uart_ops, .ops = &lh7a40x_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 2, .line = 2,
}, },
}, },
......
drivers/serial/sh-sci.c
View file @ ce8337cb
...@@ -1113,10 +1113,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1113,10 +1113,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xfffffe80, .membase = (void *)0xfffffe80,
.mapbase = 0xfffffe80, .mapbase = 0xfffffe80,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 25, .irq = 25,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1128,10 +1128,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1128,10 +1128,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)SCIF0, .membase = (void *)SCIF0,
.mapbase = SCIF0, .mapbase = SCIF0,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 55, .irq = 55,
.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,
...@@ -1142,10 +1142,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1142,10 +1142,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)SCIF2, .membase = (void *)SCIF2,
.mapbase = SCIF2, .mapbase = SCIF2,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 59, .irq = 59,
.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,
...@@ -1157,10 +1157,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1157,10 +1157,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xfffffe80, .membase = (void *)0xfffffe80,
.mapbase = 0xfffffe80, .mapbase = 0xfffffe80,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 25, .irq = 25,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1171,10 +1171,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1171,10 +1171,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xa4000150, .membase = (void *)0xa4000150,
.mapbase = 0xa4000150, .mapbase = 0xa4000150,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 59, .irq = 59,
.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,
...@@ -1185,10 +1185,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1185,10 +1185,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xa4000140, .membase = (void *)0xa4000140,
.mapbase = 0xa4000140, .mapbase = 0xa4000140,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 55, .irq = 55,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 2, .line = 2,
}, },
.type = PORT_IRDA, .type = PORT_IRDA,
...@@ -1200,10 +1200,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1200,10 +1200,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xA4430000, .membase = (void *)0xA4430000,
.mapbase = 0xA4430000, .mapbase = 0xA4430000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 25, .irq = 25,
.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,
...@@ -1215,10 +1215,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1215,10 +1215,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe00000, .membase = (void *)0xffe00000,
.mapbase = 0xffe00000, .mapbase = 0xffe00000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 25, .irq = 25,
.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,
...@@ -1230,10 +1230,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1230,10 +1230,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe80000, .membase = (void *)0xffe80000,
.mapbase = 0xffe80000, .mapbase = 0xffe80000,
.iotype = SERIAL_IO_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,
...@@ -1245,10 +1245,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1245,10 +1245,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe00000, .membase = (void *)0xffe00000,
.mapbase = 0xffe00000, .mapbase = 0xffe00000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 25, .irq = 25,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1259,10 +1259,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1259,10 +1259,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe80000, .membase = (void *)0xffe80000,
.mapbase = 0xffe80000, .mapbase = 0xffe80000,
.iotype = SERIAL_IO_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 = 1, .line = 1,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1274,10 +1274,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1274,10 +1274,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xfe600000, .membase = (void *)0xfe600000,
.mapbase = 0xfe600000, .mapbase = 0xfe600000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 55, .irq = 55,
.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,
...@@ -1288,10 +1288,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1288,10 +1288,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xfe610000, .membase = (void *)0xfe610000,
.mapbase = 0xfe610000, .mapbase = 0xfe610000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 75, .irq = 75,
.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,
...@@ -1302,10 +1302,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1302,10 +1302,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xfe620000, .membase = (void *)0xfe620000,
.mapbase = 0xfe620000, .mapbase = 0xfe620000,
.iotype = SERIAL_IO_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 = 2, .line = 2,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1317,10 +1317,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1317,10 +1317,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe80000, .membase = (void *)0xffe80000,
.mapbase = 0xffe80000, .mapbase = 0xffe80000,
.iotype = SERIAL_IO_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,
...@@ -1332,10 +1332,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1332,10 +1332,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe00000, .membase = (void *)0xffe00000,
.mapbase = 0xffe00000, .mapbase = 0xffe00000,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 26, .irq = 26,
.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,
...@@ -1346,10 +1346,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1346,10 +1346,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0xffe80000, .membase = (void *)0xffe80000,
.mapbase = 0xffe80000, .mapbase = 0xffe80000,
.iotype = SERIAL_IO_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 = 1, .line = 1,
}, },
.type = PORT_SCIF, .type = PORT_SCIF,
...@@ -1359,10 +1359,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1359,10 +1359,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
#elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
{ {
.port = { .port = {
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 42, .irq = 42,
.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,
...@@ -1374,10 +1374,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1374,10 +1374,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffffb0, .membase = (void *)0x00ffffb0,
.mapbase = 0x00ffffb0, .mapbase = 0x00ffffb0,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 54, .irq = 54,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1388,10 +1388,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1388,10 +1388,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffffb8, .membase = (void *)0x00ffffb8,
.mapbase = 0x00ffffb8, .mapbase = 0x00ffffb8,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 58, .irq = 58,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1402,10 +1402,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1402,10 +1402,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffffc0, .membase = (void *)0x00ffffc0,
.mapbase = 0x00ffffc0, .mapbase = 0x00ffffc0,
.iotype = SERIAL_IO_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 = 2, .line = 2,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1417,10 +1417,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1417,10 +1417,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffff78, .membase = (void *)0x00ffff78,
.mapbase = 0x00ffff78, .mapbase = 0x00ffff78,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 90, .irq = 90,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1431,10 +1431,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1431,10 +1431,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffff80, .membase = (void *)0x00ffff80,
.mapbase = 0x00ffff80, .mapbase = 0x00ffff80,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 94, .irq = 94,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 1, .line = 1,
}, },
.type = PORT_SCI, .type = PORT_SCI,
...@@ -1445,10 +1445,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = { ...@@ -1445,10 +1445,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
.port = { .port = {
.membase = (void *)0x00ffff88, .membase = (void *)0x00ffff88,
.mapbase = 0x00ffff88, .mapbase = 0x00ffff88,
.iotype = SERIAL_IO_MEM, .iotype = UPIO_MEM,
.irq = 98, .irq = 98,
.ops = &sci_uart_ops, .ops = &sci_uart_ops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 2, .line = 2,
}, },
.type = PORT_SCI, .type = PORT_SCI,
......
drivers/serial/sunsu.c
View file @ ce8337cb
...@@ -669,7 +669,7 @@ static int sunsu_startup(struct uart_port *port) ...@@ -669,7 +669,7 @@ static int sunsu_startup(struct uart_port *port)
* if it is, then bail out, because there's likely no UART * if it is, then bail out, because there's likely no UART
* here. * here.
*/ */
if (!(up->port.flags & ASYNC_BUGGY_UART) && if (!(up->port.flags & UPF_BUGGY_UART) &&
(serial_inp(up, UART_LSR) == 0xff)) { (serial_inp(up, UART_LSR) == 0xff)) {
printk("ttyS%d: LSR safety check engaged!\n", up->port.line); printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
return -ENODEV; return -ENODEV;
...@@ -707,7 +707,7 @@ static int sunsu_startup(struct uart_port *port) ...@@ -707,7 +707,7 @@ static int sunsu_startup(struct uart_port *port)
up->ier = UART_IER_RLSI | UART_IER_RDI; up->ier = UART_IER_RLSI | UART_IER_RDI;
serial_outp(up, UART_IER, up->ier); serial_outp(up, UART_IER, up->ier);
if (up->port.flags & ASYNC_FOURPORT) { if (up->port.flags & UPF_FOURPORT) {
unsigned int icp; unsigned int icp;
/* /*
* Enable interrupts on the AST Fourport board * Enable interrupts on the AST Fourport board
...@@ -740,7 +740,7 @@ static void sunsu_shutdown(struct uart_port *port) ...@@ -740,7 +740,7 @@ static void sunsu_shutdown(struct uart_port *port)
serial_outp(up, UART_IER, 0); serial_outp(up, UART_IER, 0);
spin_lock_irqsave(&up->port.lock, flags); spin_lock_irqsave(&up->port.lock, flags);
if (up->port.flags & ASYNC_FOURPORT) { if (up->port.flags & UPF_FOURPORT) {
/* reset interrupts on the AST Fourport board */ /* reset interrupts on the AST Fourport board */
inb((up->port.iobase & 0xfe0) | 0x1f); inb((up->port.iobase & 0xfe0) | 0x1f);
up->port.mctrl |= TIOCM_OUT1; up->port.mctrl |= TIOCM_OUT1;
...@@ -1132,7 +1132,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up) ...@@ -1132,7 +1132,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
spin_lock_irqsave(&up->port.lock, flags); spin_lock_irqsave(&up->port.lock, flags);
if (!(up->port.flags & ASYNC_BUGGY_UART)) { if (!(up->port.flags & UPF_BUGGY_UART)) {
/* /*
* Do a simple existence test first; if we fail this, there's * Do a simple existence test first; if we fail this, there's
* no point trying anything else. * no point trying anything else.
...@@ -1170,7 +1170,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up) ...@@ -1170,7 +1170,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
* manufacturer would be stupid enough to design a board * manufacturer would be stupid enough to design a board
* that conflicts with COM 1-4 --- we hope! * that conflicts with COM 1-4 --- we hope!
*/ */
if (!(up->port.flags & ASYNC_SKIP_TEST)) { if (!(up->port.flags & UPF_SKIP_TEST)) {
serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A); serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
status1 = serial_inp(up, UART_MSR) & 0xF0; status1 = serial_inp(up, UART_MSR) & 0xF0;
serial_outp(up, UART_MCR, save_mcr); serial_outp(up, UART_MCR, save_mcr);
...@@ -1371,7 +1371,7 @@ static __inline__ void wait_for_xmitr(struct uart_sunsu_port *up) ...@@ -1371,7 +1371,7 @@ static __inline__ void wait_for_xmitr(struct uart_sunsu_port *up)
} while ((status & BOTH_EMPTY) != BOTH_EMPTY); } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
/* Wait up to 1s for flow control if necessary */ /* Wait up to 1s for flow control if necessary */
if (up->port.flags & ASYNC_CONS_FLOW) { if (up->port.flags & UPF_CONS_FLOW) {
tmout = 1000000; tmout = 1000000;
while (--tmout && while (--tmout &&
((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0)) ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
...@@ -1513,7 +1513,7 @@ static int __init sunsu_serial_init(void) ...@@ -1513,7 +1513,7 @@ static int __init sunsu_serial_init(void)
up->su_type == SU_PORT_KBD) up->su_type == SU_PORT_KBD)
continue; continue;
up->port.flags |= ASYNC_BOOT_AUTOCONF; up->port.flags |= UPF_BOOT_AUTOCONF;
up->port.type = PORT_UNKNOWN; up->port.type = PORT_UNKNOWN;
up->port.uartclk = (SU_BASE_BAUD * 16); up->port.uartclk = (SU_BASE_BAUD * 16);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7