Merge master.kernel.org:/home/rmk/linux-2.6-serial

28 files changed, 49 insertions, 55 deletions

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index dc31e3fd6c57..8ab1b040288c 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -27,7 +27,6 @@
 #include <asm/mach/arch.h>
 #include <linux/interrupt.h>
 #include "generic.h"
-#include <asm/serial.h>
 
 static struct resource cs89x0_resources[] = {
         [0] = {
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 050685b87a3c..b9713a723053 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -140,7 +140,7 @@ void __init plat_setup(void)
                 uart.type       = PORT_UNKNOWN;
                 uart.uartclk    = 18432000;
                 uart.irq        = COBALT_SERIAL_IRQ;
-                uart.flags      = STD_COM_FLAGS;
+                uart.flags      = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
                 uart.iobase     = 0xc800000;
                 uart.iotype     = UPIO_PORT;
 
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index dcd819d57dae..83eb08b7a072 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -134,8 +134,8 @@ void __init serial_init(void)
 
         memset(&s, 0, sizeof(s));
 
-        s.flags = STD_COM_FLAGS;
-        s.iotype = SERIAL_IO_MEM;
+        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
+        s.iotype = UPIO_MEM;
 
         if (mips_machtype == MACH_LASAT_100) {
                 s.uartclk = LASAT_BASE_BAUD_100 * 16;
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 625843b30bed..873cf3141a31 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -82,8 +82,8 @@ static void __init serial_init(void)
 #endif
         s.irq = ATLASINT_UART;
         s.uartclk = ATLAS_BASE_BAUD * 16;
-        s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
-        s.iotype = SERIAL_IO_PORT;
+        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
+        s.iotype = UPIO_PORT;
         s.regshift = 3;
 
         if (early_serial_setup(&s) != 0) {
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index f966bc161dfa..4266ce445174 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -71,8 +71,8 @@ static void __init serial_init(void)
 #endif
         s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
         s.uartclk = SEAD_BASE_BAUD * 16;
-        s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
-        s.iotype = 0;
+        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
+        s.iotype = UPIO_PORT;
         s.regshift = 3;
 
         if (early_serial_setup(&s) != 0) {
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c
index 485d5a58d9cf..a2fd62997ca3 100644
--- a/arch/mips/mips-boards/sim/sim_setup.c
+++ b/arch/mips/mips-boards/sim/sim_setup.c
@@ -88,8 +88,8 @@ static void __init serial_init(void)
          but poll for now */
         s.irq =  0;
         s.uartclk = BASE_BAUD * 16;
-        s.flags = ASYNC_BOOT_AUTOCONF | UPF_SKIP_TEST;
-        s.iotype = SERIAL_IO_PORT | ASYNC_SKIP_TEST;
+        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
+        s.iotype = UPIO_PORT;
         s.regshift = 0;
         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)
         up.uartclk      = JAGUAR_ATX_UART_CLK;
         up.regshift     = 2;
         up.iotype       = UPIO_MEM;
-        up.flags        = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        up.flags        = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         up.line         = 0;
 
         if (early_serial_setup(&up))
diff --git a/arch/mips/philips/pnx8550/common/platform.c b/arch/mips/philips/pnx8550/common/platform.c
index 8aa9bd65b45e..a592260fd673 100644
--- a/arch/mips/philips/pnx8550/common/platform.c
+++ b/arch/mips/philips/pnx8550/common/platform.c
@@ -66,28 +66,28 @@ struct ip3106_port ip3106_ports[] = {
         [0] = {
                 .port   = {
                         .type           = PORT_IP3106,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .membase        = (void __iomem *)PNX8550_UART_PORT0,
                         .mapbase        = PNX8550_UART_PORT0,
                         .irq            = PNX8550_UART_INT(0),
                         .uartclk        = 3692300,
                         .fifosize       = 16,
                         .ops            = &ip3106_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
         },
         [1] = {
                 .port   = {
                         .type           = PORT_IP3106,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .membase        = (void __iomem *)PNX8550_UART_PORT1,
                         .mapbase        = PNX8550_UART_PORT1,
                         .irq            = PNX8550_UART_INT(1),
                         .uartclk        = 3692300,
                         .fifosize       = 16,
                         .ops            = &ip3106_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
         },
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)
         up.uartclk      = TITAN_UART_CLK;
         up.regshift     = 0;
         up.iotype       = UPIO_MEM;
-        up.flags        = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        up.flags        = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         up.line         = 0;
 
         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)
 #include <linux/tty.h>
 #include <linux/serial.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 */
 
 /* An arbitrary time; this can be decreased if reliability looks good */
@@ -110,8 +105,8 @@ void __init plat_setup(void)
                 o2_serial[0].type       = PORT_16550A;
                 o2_serial[0].line       = 0;
                 o2_serial[0].irq        = MACEISA_SERIAL1_IRQ;
-                o2_serial[0].flags      = STD_COM_FLAGS;
-                o2_serial[0].uartclk    = BASE_BAUD * 16;
+                o2_serial[0].flags      = UPF_SKIP_TEST;
+                o2_serial[0].uartclk    = 1843200;
                 o2_serial[0].iotype     = UPIO_MEM;
                 o2_serial[0].membase    = (char *)&mace->isa.serial1;
                 o2_serial[0].fifosize   = 14;
@@ -121,8 +116,8 @@ void __init plat_setup(void)
                 o2_serial[1].type       = PORT_16550A;
                 o2_serial[1].line       = 1;
                 o2_serial[1].irq        = MACEISA_SERIAL2_IRQ;
-                o2_serial[1].flags      = STD_COM_FLAGS;
-                o2_serial[1].uartclk    = BASE_BAUD * 16;
+                o2_serial[1].flags      = UPF_SKIP_TEST;
+                o2_serial[1].uartclk    = 1843200;
                 o2_serial[1].iotype     = UPIO_MEM;
                 o2_serial[1].membase    = (char *)&mace->isa.serial2;
                 o2_serial[1].fifosize   = 14;
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c
index 159b228eca1e..0ec53f049338 100644
--- a/arch/ppc/platforms/4xx/bamboo.c
+++ b/arch/ppc/platforms/4xx/bamboo.c
@@ -332,8 +332,8 @@ bamboo_early_serial_map(void)
         port.irq = 0;
         port.uartclk = clocks.uart0;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/bubinga.c b/arch/ppc/platforms/4xx/bubinga.c
index 8110f55668c5..ce48a4f08cbb 100644
--- a/arch/ppc/platforms/4xx/bubinga.c
+++ b/arch/ppc/platforms/4xx/bubinga.c
@@ -97,8 +97,8 @@ bubinga_early_serial_map(void)
         port.irq = ACTING_UART0_INT;
         port.uartclk = uart_clock;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 64ebae19cdbb..9a828b623417 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -225,8 +225,8 @@ ebony_early_serial_map(void)
         port.irq = 0;
         port.uartclk = clocks.uart0;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c
index d810b736d9bf..21d29132aebd 100644
--- a/arch/ppc/platforms/4xx/luan.c
+++ b/arch/ppc/platforms/4xx/luan.c
@@ -279,8 +279,8 @@ luan_early_serial_map(void)
         port.irq = UART0_INT;
         port.uartclk = clocks.uart0;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 73b2c98158f6..4f355b6acab2 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -248,8 +248,8 @@ ocotea_early_serial_map(void)
         port.irq = UART0_INT;
         port.uartclk = clocks.uart0;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         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 0b1b77d986bf..e90d97f64f76 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -95,8 +95,8 @@ ml300_early_serial_map(void)
                 port.irq = old_ports[i].irq;
                 port.uartclk = old_ports[i].baud_base * 16;
                 port.regshift = old_ports[i].iomem_reg_shift;
-                port.iotype = SERIAL_IO_MEM;
-                port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+                port.iotype = UPIO_MEM;
+                port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
                 port.line = i;
 
                 if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c
index e60f4bd437ec..b065b8babcd3 100644
--- a/arch/ppc/platforms/4xx/yucca.c
+++ b/arch/ppc/platforms/4xx/yucca.c
@@ -305,8 +305,8 @@ yucca_early_serial_map(void)
         port.irq = UART0_INT;
         port.uartclk = clocks.uart0;
         port.regshift = 0;
-        port.iotype = SERIAL_IO_MEM;
-        port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        port.iotype = UPIO_MEM;
+        port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
         port.line = 0;
 
         if (early_serial_setup(&port) != 0) {
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index 012e1e652c03..1a659bbc1860 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -301,14 +301,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 struct uart_port p;
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500);
                 p.uartclk = binfo->bi_busfreq;
 
                 gen550_init(0, &p);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600);
                 p.uartclk = binfo->bi_busfreq;
 
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index 2eceb1e6f4eb..408d64f18e1a 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -162,14 +162,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                           binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
                 gen550_init(0, &p);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index b332ebae6bd3..1801ab392e22 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -534,14 +534,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                                 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
                 gen550_init(0, &p);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index e777ba824aa9..8a72221f816c 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -64,7 +64,7 @@ sbc8560_early_serial_map(void)
         uart_req.irq = MPC85xx_IRQ_EXT9;
         uart_req.flags = STD_COM_FLAGS;
         uart_req.uartclk = BASE_BAUD * 16;
-        uart_req.iotype = SERIAL_IO_MEM;
+        uart_req.iotype = UPIO_MEM;
         uart_req.mapbase = UARTA_ADDR;
         uart_req.membase = ioremap(uart_req.mapbase, MPC85xx_UART0_SIZE);
         uart_req.type = PORT_16650;
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c
index b436f4d0a3fa..a5e38ba62732 100644
--- a/arch/ppc/platforms/85xx/tqm85xx.c
+++ b/arch/ppc/platforms/85xx/tqm85xx.c
@@ -346,14 +346,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                           binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
                 gen550_init(0, &p);
 
                 memset(&p, 0, sizeof (p));
-                p.iotype = SERIAL_IO_MEM;
+                p.iotype = UPIO_MEM;
                 p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET;
                 p.uartclk = binfo->bi_busfreq;
 
diff --git a/arch/ppc/platforms/chestnut.c b/arch/ppc/platforms/chestnut.c
index 48a4a510d598..aefcc0e7be57 100644
--- a/arch/ppc/platforms/chestnut.c
+++ b/arch/ppc/platforms/chestnut.c
@@ -116,7 +116,7 @@ chestnut_early_serial_map(void)
         port.uartclk = BASE_BAUD * 16;
         port.irq = UART0_INT;
         port.flags = STD_COM_FLAGS | UPF_IOREMAP;
-        port.iotype = SERIAL_IO_MEM;
+        port.iotype = UPIO_MEM;
         port.mapbase = CHESTNUT_UART0_IO_BASE;
         port.regshift = 0;
 
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index 32358b3fb236..ffde8f6f6302 100644
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -330,7 +330,7 @@ ev64260_early_serial_map(void)
                 port.irq = EV64260_UART_0_IRQ;
                 port.uartclk = BASE_BAUD * 16;
                 port.regshift = 2;
-                port.iotype = SERIAL_IO_MEM;
+                port.iotype = UPIO_MEM;
                 port.flags = STD_COM_FLAGS;
 
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 708b8739ecdd..872c0a3ba3c7 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -100,7 +100,7 @@ static void __init ppc7d_early_serial_map(void)
         serial_req.uartclk = UART_CLK;
         serial_req.irq = 4;
         serial_req.flags = STD_COM_FLAGS;
-        serial_req.iotype = SERIAL_IO_MEM;
+        serial_req.iotype = UPIO_MEM;
         serial_req.membase = (u_char *) PPC7D_SERIAL_0;
 
         gen550_init(0, &serial_req);
diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c
index 5ad70d357cb9..69e1de7971f2 100644
--- a/arch/ppc/platforms/spruce.c
+++ b/arch/ppc/platforms/spruce.c
@@ -176,8 +176,8 @@ spruce_early_serial_map(void)
         memset(&serial_req, 0, sizeof(serial_req));
         serial_req.uartclk = uart_clk;
         serial_req.irq = UART0_INT;
-        serial_req.flags = ASYNC_BOOT_AUTOCONF;
-        serial_req.iotype = SERIAL_IO_MEM;
+        serial_req.flags = UPF_BOOT_AUTOCONF;
+        serial_req.iotype = UPIO_MEM;
         serial_req.membase = (u_char *)UART0_IO_BASE;
         serial_req.regshift = 0;
 
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c
index 1b5fe9e398d4..7bada82527a8 100644
--- a/arch/ppc/syslib/ppc83xx_setup.c
+++ b/arch/ppc/syslib/ppc83xx_setup.c
@@ -108,7 +108,7 @@ mpc83xx_early_serial_map(void)
 
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
         memset(&serial_req, 0, sizeof (serial_req));
-        serial_req.iotype = SERIAL_IO_MEM;
+        serial_req.iotype = UPIO_MEM;
         serial_req.mapbase = pdata[0].mapbase;
         serial_req.membase = pdata[0].membase;
         serial_req.regshift = 0;
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index 1a47ff4b831d..e4dda43fdaa7 100644
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -90,7 +90,7 @@ mpc85xx_early_serial_map(void)
 
 #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
         memset(&serial_req, 0, sizeof (serial_req));
-        serial_req.iotype = SERIAL_IO_MEM;
+        serial_req.iotype = UPIO_MEM;
         serial_req.mapbase = pdata[0].mapbase;
         serial_req.membase = pdata[0].membase;
         serial_req.regshift = 0;