1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 80737c131ce7..44f6bf79bbe1 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1468,10 +1468,10 @@ static struct sci_port sci_ports[] = {
                .port   = {
                        .membase        = (void *)0xff923000,
                        .mapbase        = 0xff923000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .irq            = 61,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 0,
                },
                .type           = PORT_SCIF,
@@ -1482,10 +1482,10 @@ static struct sci_port sci_ports[] = {
                .port   = {
                        .membase        = (void *)0xff924000,
                        .mapbase        = 0xff924000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .irq            = 62,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 1,
                },
                .type           = PORT_SCIF,
@@ -1496,10 +1496,10 @@ static struct sci_port sci_ports[] = {
                .port   = {
                        .membase        = (void *)0xff925000,
                        .mapbase        = 0xff925000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .irq            = 63,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 2,
                },
                .type           = PORT_SCIF,
@@ -1511,10 +1511,10 @@ static struct sci_port sci_ports[] = {
                .port   = {
                        .membase        = (void *)0xffe00000,
                        .mapbase        = 0xffe00000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .irq            = 43,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 0,
                },
                .type           = PORT_SCIF,
@@ -1525,10 +1525,10 @@ static struct sci_port sci_ports[] = {
                .port   = {
                        .membase        = (void *)0xffe10000,
                        .mapbase        = 0xffe10000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                        .irq            = 79,
                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                        .line           = 1,
                },
                .type           = PORT_SCIF,

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 80737c131ce7..44f6bf79bbe1 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c
@@ -1468,10 +1468,10 @@ static struct sci_port sci_ports[] = {
1468	.port = {	1468	.port = {
1469	.membase = (void *)0xff923000,	1469	.membase = (void *)0xff923000,
1470	.mapbase = 0xff923000,	1470	.mapbase = 0xff923000,
1471	.iotype = SERIAL_IO_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,
@@ -1482,10 +1482,10 @@ static struct sci_port sci_ports[] = {
1482	.port = {	1482	.port = {
1483	.membase = (void *)0xff924000,	1483	.membase = (void *)0xff924000,
1484	.mapbase = 0xff924000,	1484	.mapbase = 0xff924000,
1485	.iotype = SERIAL_IO_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,
@@ -1496,10 +1496,10 @@ static struct sci_port sci_ports[] = {
1496	.port = {	1496	.port = {
1497	.membase = (void *)0xff925000,	1497	.membase = (void *)0xff925000,
1498	.mapbase = 0xff925000,	1498	.mapbase = 0xff925000,
1499	.iotype = SERIAL_IO_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,
@@ -1511,10 +1511,10 @@ static struct sci_port sci_ports[] = {
1511	.port = {	1511	.port = {
1512	.membase = (void *)0xffe00000,	1512	.membase = (void *)0xffe00000,
1513	.mapbase = 0xffe00000,	1513	.mapbase = 0xffe00000,
1514	.iotype = SERIAL_IO_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,
@@ -1525,10 +1525,10 @@ static struct sci_port sci_ports[] = {
1525	.port = {	1525	.port = {
1526	.membase = (void *)0xffe10000,	1526	.membase = (void *)0xffe10000,
1527	.mapbase = 0xffe10000,	1527	.mapbase = 0xffe10000,
1528	.iotype = SERIAL_IO_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,