GIT 620739025b94fe472c845ce013bff62716d3c576 git+ssh://master.kernel.org/home/rmk/linux-2.6-serial.git commit 620739025b94fe472c845ce013bff62716d3c576 Author: Russell King Date: Sun Feb 5 11:11:20 2006 +0000 [SERIAL] Remove unnecessary serial.h include imx.c does not use anything from serial.h, so remove it. Signed-off-by: Russell King commit 59a675b22026e29e7f281d7b832de67dd8559b83 Author: Russell King Date: Sun Feb 5 10:52:29 2006 +0000 [SERIAL] uart_port flags member should use UPF_* Convert usage of ASYNC_* to UPF_*. Signed-off-by: Russell King commit 9b4a1617772d6d5ab5eeda0cd95302fae119e359 Author: Russell King Date: Sun Feb 5 10:48:10 2006 +0000 [SERIAL] uart_port iotype member should use UPIO_* Convert usage of SERIAL_IO_* to UPIO_*. Signed-off-by: Russell King --- Signed-off-by: Andrew Morton --- ppc/platforms/4xx/xilinx_ml300.c | 0 arch/arm/mach-imx/mx1ads.c | 1 arch/mips/cobalt/setup.c | 2 - arch/mips/lasat/setup.c | 4 +-- arch/mips/mips-boards/atlas/atlas_setup.c | 4 +-- arch/mips/mips-boards/sead/sead_setup.c | 4 +-- arch/mips/mips-boards/sim/sim_setup.c | 4 +-- arch/mips/momentum/jaguar_atx/ja-console.c | 2 - arch/mips/philips/pnx8550/common/platform.c | 8 +++--- arch/mips/pmc-sierra/yosemite/setup.c | 2 - arch/mips/sgi-ip32/ip32-setup.c | 13 +++-------- arch/ppc/platforms/4xx/bamboo.c | 4 +-- arch/ppc/platforms/4xx/bubinga.c | 4 +-- arch/ppc/platforms/4xx/ebony.c | 4 +-- arch/ppc/platforms/4xx/luan.c | 4 +-- arch/ppc/platforms/4xx/ocotea.c | 4 +-- arch/ppc/platforms/4xx/yucca.c | 4 +-- arch/ppc/platforms/83xx/mpc834x_sys.c | 4 +-- arch/ppc/platforms/85xx/mpc8540_ads.c | 4 +-- arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 4 +-- arch/ppc/platforms/85xx/sbc8560.c | 2 - arch/ppc/platforms/85xx/tqm85xx.c | 4 +-- arch/ppc/platforms/chestnut.c | 2 - arch/ppc/platforms/ev64260.c | 2 - arch/ppc/platforms/radstone_ppc7d.c | 2 - arch/ppc/platforms/spruce.c | 4 +-- arch/ppc/syslib/ppc83xx_setup.c | 2 - arch/ppc/syslib/ppc85xx_setup.c | 2 - drivers/serial/21285.c | 2 - drivers/serial/amba-pl010.c | 4 +-- drivers/serial/au1x00_uart.c | 12 +++++----- drivers/serial/cpm_uart/cpm_uart_core.c | 12 +++++----- drivers/serial/dz.c | 2 - drivers/serial/imx.c | 4 +-- drivers/serial/m32r_sio.c | 2 - drivers/serial/mux.c | 2 - drivers/serial/pmac_zilog.c | 2 - drivers/serial/sa1100.c | 2 - drivers/serial/serial_lh7a40x.c | 6 ++--- drivers/serial/sh-sci.c | 20 ++++++++--------- drivers/serial/sunsab.c | 2 - drivers/serial/sunsu.c | 10 ++++---- drivers/serial/sunzilog.c | 4 +-- drivers/serial/v850e_uart.c | 2 - 44 files changed, 91 insertions(+), 97 deletions(-) diff -puN arch/arm/mach-imx/mx1ads.c~git-serial arch/arm/mach-imx/mx1ads.c --- devel/arch/arm/mach-imx/mx1ads.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/arm/mach-imx/mx1ads.c 2006-02-07 17:59:13.000000000 -0800 @@ -27,7 +27,6 @@ #include #include #include "generic.h" -#include static struct resource cs89x0_resources[] = { [0] = { diff -puN arch/mips/cobalt/setup.c~git-serial arch/mips/cobalt/setup.c --- devel/arch/mips/cobalt/setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/cobalt/setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/lasat/setup.c~git-serial arch/mips/lasat/setup.c --- devel/arch/mips/lasat/setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/lasat/setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/mips-boards/atlas/atlas_setup.c~git-serial arch/mips/mips-boards/atlas/atlas_setup.c --- devel/arch/mips/mips-boards/atlas/atlas_setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/mips-boards/atlas/atlas_setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/mips-boards/sead/sead_setup.c~git-serial arch/mips/mips-boards/sead/sead_setup.c --- devel/arch/mips/mips-boards/sead/sead_setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/mips-boards/sead/sead_setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/mips-boards/sim/sim_setup.c~git-serial arch/mips/mips-boards/sim/sim_setup.c --- devel/arch/mips/mips-boards/sim/sim_setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/mips-boards/sim/sim_setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/momentum/jaguar_atx/ja-console.c~git-serial arch/mips/momentum/jaguar_atx/ja-console.c --- devel/arch/mips/momentum/jaguar_atx/ja-console.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/momentum/jaguar_atx/ja-console.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/philips/pnx8550/common/platform.c~git-serial arch/mips/philips/pnx8550/common/platform.c --- devel/arch/mips/philips/pnx8550/common/platform.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/philips/pnx8550/common/platform.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/pmc-sierra/yosemite/setup.c~git-serial arch/mips/pmc-sierra/yosemite/setup.c --- devel/arch/mips/pmc-sierra/yosemite/setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/pmc-sierra/yosemite/setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/mips/sgi-ip32/ip32-setup.c~git-serial arch/mips/sgi-ip32/ip32-setup.c --- devel/arch/mips/sgi-ip32/ip32-setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/mips/sgi-ip32/ip32-setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -66,11 +66,6 @@ static inline void str2eaddr(unsigned ch #include #include #include -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 -puN arch/ppc/platforms/4xx/bamboo.c~git-serial arch/ppc/platforms/4xx/bamboo.c --- devel/arch/ppc/platforms/4xx/bamboo.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/bamboo.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/4xx/bubinga.c~git-serial arch/ppc/platforms/4xx/bubinga.c --- devel/arch/ppc/platforms/4xx/bubinga.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/bubinga.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/4xx/ebony.c~git-serial arch/ppc/platforms/4xx/ebony.c --- devel/arch/ppc/platforms/4xx/ebony.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/ebony.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/4xx/luan.c~git-serial arch/ppc/platforms/4xx/luan.c --- devel/arch/ppc/platforms/4xx/luan.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/luan.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/4xx/ocotea.c~git-serial arch/ppc/platforms/4xx/ocotea.c --- devel/arch/ppc/platforms/4xx/ocotea.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/ocotea.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/4xx/xilinx_ml300.c~git-serial arch/ppc/platforms/4xx/xilinx_ml300.c diff -puN arch/ppc/platforms/4xx/yucca.c~git-serial arch/ppc/platforms/4xx/yucca.c --- devel/arch/ppc/platforms/4xx/yucca.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/4xx/yucca.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/83xx/mpc834x_sys.c~git-serial arch/ppc/platforms/83xx/mpc834x_sys.c --- devel/arch/ppc/platforms/83xx/mpc834x_sys.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/83xx/mpc834x_sys.c 2006-02-07 17:59:13.000000000 -0800 @@ -301,14 +301,14 @@ platform_init(unsigned long r3, unsigned 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 -puN arch/ppc/platforms/85xx/mpc8540_ads.c~git-serial arch/ppc/platforms/85xx/mpc8540_ads.c --- devel/arch/ppc/platforms/85xx/mpc8540_ads.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/85xx/mpc8540_ads.c 2006-02-07 17:59:13.000000000 -0800 @@ -162,14 +162,14 @@ platform_init(unsigned long r3, unsigned 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 -puN arch/ppc/platforms/85xx/mpc85xx_cds_common.c~git-serial arch/ppc/platforms/85xx/mpc85xx_cds_common.c --- devel/arch/ppc/platforms/85xx/mpc85xx_cds_common.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2006-02-07 17:59:13.000000000 -0800 @@ -534,14 +534,14 @@ platform_init(unsigned long r3, unsigned 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 -puN arch/ppc/platforms/85xx/sbc8560.c~git-serial arch/ppc/platforms/85xx/sbc8560.c --- devel/arch/ppc/platforms/85xx/sbc8560.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/85xx/sbc8560.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/85xx/tqm85xx.c~git-serial arch/ppc/platforms/85xx/tqm85xx.c --- devel/arch/ppc/platforms/85xx/tqm85xx.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/85xx/tqm85xx.c 2006-02-07 17:59:13.000000000 -0800 @@ -346,14 +346,14 @@ platform_init(unsigned long r3, unsigned 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 -puN arch/ppc/platforms/chestnut.c~git-serial arch/ppc/platforms/chestnut.c --- devel/arch/ppc/platforms/chestnut.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/chestnut.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/ev64260.c~git-serial arch/ppc/platforms/ev64260.c --- devel/arch/ppc/platforms/ev64260.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/ev64260.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/platforms/radstone_ppc7d.c~git-serial arch/ppc/platforms/radstone_ppc7d.c --- devel/arch/ppc/platforms/radstone_ppc7d.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/radstone_ppc7d.c 2006-02-07 17:59:13.000000000 -0800 @@ -100,7 +100,7 @@ static void __init ppc7d_early_serial_ma 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 -puN arch/ppc/platforms/spruce.c~git-serial arch/ppc/platforms/spruce.c --- devel/arch/ppc/platforms/spruce.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/platforms/spruce.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/syslib/ppc83xx_setup.c~git-serial arch/ppc/syslib/ppc83xx_setup.c --- devel/arch/ppc/syslib/ppc83xx_setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/syslib/ppc83xx_setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN arch/ppc/syslib/ppc85xx_setup.c~git-serial arch/ppc/syslib/ppc85xx_setup.c --- devel/arch/ppc/syslib/ppc85xx_setup.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/arch/ppc/syslib/ppc85xx_setup.c 2006-02-07 17:59:13.000000000 -0800 @@ -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; diff -puN drivers/serial/21285.c~git-serial drivers/serial/21285.c --- devel/drivers/serial/21285.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/21285.c 2006-02-07 17:59:13.000000000 -0800 @@ -362,7 +362,7 @@ static struct uart_ops serial21285_ops = static struct uart_port serial21285_port = { .mapbase = 0x42000160, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = NO_IRQ, .fifosize = 16, .ops = &serial21285_ops, diff -puN drivers/serial/amba-pl010.c~git-serial drivers/serial/amba-pl010.c --- devel/drivers/serial/amba-pl010.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/amba-pl010.c 2006-02-07 17:59:13.000000000 -0800 @@ -561,7 +561,7 @@ static struct uart_amba_port amba_ports[ .port = { .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE), .mapbase = INTEGRATOR_UART0_BASE, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = IRQ_UARTINT0, .uartclk = 14745600, .fifosize = 16, @@ -576,7 +576,7 @@ static struct uart_amba_port amba_ports[ .port = { .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE), .mapbase = INTEGRATOR_UART1_BASE, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = IRQ_UARTINT1, .uartclk = 14745600, .fifosize = 16, diff -puN drivers/serial/au1x00_uart.c~git-serial drivers/serial/au1x00_uart.c --- devel/drivers/serial/au1x00_uart.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/au1x00_uart.c 2006-02-07 17:59:13.000000000 -0800 @@ -892,7 +892,7 @@ serial8250_request_std_resource(struct u int ret = 0; switch (up->port.iotype) { - case SERIAL_IO_MEM: + case UPIO_MEM: if (up->port.mapbase) { *res = request_mem_region(up->port.mapbase, size, "serial"); if (!*res) @@ -900,8 +900,8 @@ serial8250_request_std_resource(struct u } break; - case SERIAL_IO_HUB6: - case SERIAL_IO_PORT: + case UPIO_HUB6: + case UPIO_PORT: *res = request_region(up->port.iobase, size, "serial"); if (!*res) ret = -EBUSY; @@ -919,7 +919,7 @@ static void serial8250_release_port(stru size <<= up->port.regshift; switch (up->port.iotype) { - case SERIAL_IO_MEM: + case UPIO_MEM: if (up->port.mapbase) { /* * Unmap the area. @@ -935,8 +935,8 @@ static void serial8250_release_port(stru } break; - case SERIAL_IO_HUB6: - case SERIAL_IO_PORT: + case UPIO_HUB6: + case UPIO_PORT: start = up->port.iobase; if (size) diff -puN drivers/serial/cpm_uart/cpm_uart_core.c~git-serial drivers/serial/cpm_uart/cpm_uart_core.c --- devel/drivers/serial/cpm_uart/cpm_uart_core.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/cpm_uart/cpm_uart_core.c 2006-02-07 17:59:13.000000000 -0800 @@ -908,7 +908,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SMC1_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .flags = FLAG_SMC, @@ -922,7 +922,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SMC2_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .flags = FLAG_SMC, @@ -939,7 +939,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SCC1_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .tx_nrfifos = TX_NUM_FIFO, @@ -953,7 +953,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SCC2_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .tx_nrfifos = TX_NUM_FIFO, @@ -967,7 +967,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SCC3_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .tx_nrfifos = TX_NUM_FIFO, @@ -981,7 +981,7 @@ struct uart_cpm_port cpm_uart_ports[UART .port = { .irq = SCC4_IRQ, .ops = &cpm_uart_pops, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .lock = SPIN_LOCK_UNLOCKED, }, .tx_nrfifos = TX_NUM_FIFO, diff -puN drivers/serial/dz.c~git-serial drivers/serial/dz.c --- devel/drivers/serial/dz.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/dz.c 2006-02-07 17:59:13.000000000 -0800 @@ -650,7 +650,7 @@ static void __init dz_init_ports(void) for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) { spin_lock_init(&dport->port.lock); dport->port.membase = (char *) base; - dport->port.iotype = SERIAL_IO_PORT; + dport->port.iotype = UPIO_PORT; dport->port.irq = dec_interrupt[DEC_IRQ_DZ11]; dport->port.line = i; dport->port.fifosize = 1; diff -puN drivers/serial/imx.c~git-serial drivers/serial/imx.c --- devel/drivers/serial/imx.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/imx.c 2006-02-07 17:59:13.000000000 -0800 @@ -668,7 +668,7 @@ static struct imx_port imx_ports[] = { .rtsirq = UART1_MINT_RTS, .port = { .type = PORT_IMX, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .membase = (void *)IMX_UART1_BASE, .mapbase = IMX_UART1_BASE, /* FIXME */ .irq = UART1_MINT_RX, @@ -684,7 +684,7 @@ static struct imx_port imx_ports[] = { .rtsirq = UART2_MINT_RTS, .port = { .type = PORT_IMX, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .membase = (void *)IMX_UART2_BASE, .mapbase = IMX_UART2_BASE, /* FIXME */ .irq = UART2_MINT_RX, diff -puN drivers/serial/m32r_sio.c~git-serial drivers/serial/m32r_sio.c --- devel/drivers/serial/m32r_sio.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/m32r_sio.c 2006-02-07 17:59:13.000000000 -0800 @@ -80,7 +80,7 @@ #include /* 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 diff -puN drivers/serial/mux.c~git-serial drivers/serial/mux.c --- devel/drivers/serial/mux.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/mux.c 2006-02-07 17:59:13.000000000 -0800 @@ -462,7 +462,7 @@ static int __init mux_probe(struct paris port->mapbase = dev->hpa.start + MUX_OFFSET + (i * MUX_LINE_OFFSET); port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET); - port->iotype = SERIAL_IO_MEM; + port->iotype = UPIO_MEM; port->type = PORT_MUX; port->irq = NO_IRQ; port->uartclk = 0; diff -puN drivers/serial/pmac_zilog.c~git-serial drivers/serial/pmac_zilog.c --- devel/drivers/serial/pmac_zilog.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/pmac_zilog.c 2006-02-07 17:59:13.000000000 -0800 @@ -1492,7 +1492,7 @@ no_dma: /* * Init remaining bits of "port" structure */ - uap->port.iotype = SERIAL_IO_MEM; + uap->port.iotype = UPIO_MEM; uap->port.irq = np->intrs[0].line; uap->port.uartclk = ZS_CLOCK; uap->port.fifosize = 1; diff -puN drivers/serial/sa1100.c~git-serial drivers/serial/sa1100.c --- devel/drivers/serial/sa1100.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/sa1100.c 2006-02-07 17:59:13.000000000 -0800 @@ -628,7 +628,7 @@ static void __init sa1100_init_ports(voi sa1100_ports[i].port.ops = &sa1100_pops; sa1100_ports[i].port.fifosize = 8; sa1100_ports[i].port.line = i; - sa1100_ports[i].port.iotype = SERIAL_IO_MEM; + sa1100_ports[i].port.iotype = UPIO_MEM; init_timer(&sa1100_ports[i].timer); sa1100_ports[i].timer.function = sa1100_timeout; sa1100_ports[i].timer.data = (unsigned long)&sa1100_ports[i]; diff -puN drivers/serial/serial_lh7a40x.c~git-serial drivers/serial/serial_lh7a40x.c --- devel/drivers/serial/serial_lh7a40x.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/serial_lh7a40x.c 2006-02-07 17:59:13.000000000 -0800 @@ -501,7 +501,7 @@ static struct uart_port_lh7a40x lh7a40x_ .port = { .membase = (void*) io_p2v (UART1_PHYS), .mapbase = UART1_PHYS, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = IRQ_UART1INTR, .uartclk = 14745600/2, .fifosize = 16, @@ -514,7 +514,7 @@ static struct uart_port_lh7a40x lh7a40x_ .port = { .membase = (void*) io_p2v (UART2_PHYS), .mapbase = UART2_PHYS, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = IRQ_UART2INTR, .uartclk = 14745600/2, .fifosize = 16, @@ -527,7 +527,7 @@ static struct uart_port_lh7a40x lh7a40x_ .port = { .membase = (void*) io_p2v (UART3_PHYS), .mapbase = UART3_PHYS, - .iotype = SERIAL_IO_MEM, + .iotype = UPIO_MEM, .irq = IRQ_UART3INTR, .uartclk = 14745600/2, .fifosize = 16, diff -puN drivers/serial/sh-sci.c~git-serial drivers/serial/sh-sci.c --- devel/drivers/serial/sh-sci.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/sh-sci.c 2006-02-07 17:59:13.000000000 -0800 @@ -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 -puN drivers/serial/sunsab.c~git-serial drivers/serial/sunsab.c --- devel/drivers/serial/sunsab.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/sunsab.c 2006-02-07 17:59:13.000000000 -0800 @@ -1036,7 +1036,7 @@ static void __init sab_attach_callback(s up->port.irq = edev->irqs[0]; up->port.fifosize = SAB82532_XMIT_FIFO_SIZE; up->port.mapbase = (unsigned long)up->regs; - up->port.iotype = SERIAL_IO_MEM; + up->port.iotype = UPIO_MEM; writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc); diff -puN drivers/serial/sunsu.c~git-serial drivers/serial/sunsu.c --- devel/drivers/serial/sunsu.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/sunsu.c 2006-02-07 17:59:13.000000000 -0800 @@ -109,11 +109,11 @@ static _INLINE_ unsigned int serial_in(s offset <<= up->port.regshift; switch (up->port.iotype) { - case SERIAL_IO_HUB6: + case UPIO_HUB6: outb(up->port.hub6 - 1 + offset, up->port.iobase); return inb(up->port.iobase + 1); - case SERIAL_IO_MEM: + case UPIO_MEM: return readb(up->port.membase + offset); default: @@ -139,12 +139,12 @@ serial_out(struct uart_sunsu_port *up, i offset <<= up->port.regshift; switch (up->port.iotype) { - case SERIAL_IO_HUB6: + case UPIO_HUB6: outb(up->port.hub6 - 1 + offset, up->port.iobase); outb(value, up->port.iobase + 1); break; - case SERIAL_IO_MEM: + case UPIO_MEM: writeb(value, up->port.membase + offset); break; @@ -1052,7 +1052,7 @@ static void sunsu_autoconfig(struct uart return; up->type_probed = PORT_UNKNOWN; - up->port.iotype = SERIAL_IO_MEM; + up->port.iotype = UPIO_MEM; /* * First we look for Ebus-bases su's diff -puN drivers/serial/sunzilog.c~git-serial drivers/serial/sunzilog.c --- devel/drivers/serial/sunzilog.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/sunzilog.c 2006-02-07 17:59:13.000000000 -0800 @@ -1487,7 +1487,7 @@ static void __init sunzilog_prepare(void up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB; /* Channel A */ - up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM; + up[(chip * 2) + 0].port.iotype = UPIO_MEM; up[(chip * 2) + 0].port.irq = zilog_irq; up[(chip * 2) + 0].port.uartclk = ZS_CLOCK; up[(chip * 2) + 0].port.fifosize = 1; @@ -1498,7 +1498,7 @@ static void __init sunzilog_prepare(void up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A; /* Channel B */ - up[(chip * 2) + 1].port.iotype = SERIAL_IO_MEM; + up[(chip * 2) + 1].port.iotype = UPIO_MEM; up[(chip * 2) + 1].port.irq = zilog_irq; up[(chip * 2) + 1].port.uartclk = ZS_CLOCK; up[(chip * 2) + 1].port.fifosize = 1; diff -puN drivers/serial/v850e_uart.c~git-serial drivers/serial/v850e_uart.c --- devel/drivers/serial/v850e_uart.c~git-serial 2006-02-07 17:59:13.000000000 -0800 +++ devel-akpm/drivers/serial/v850e_uart.c 2006-02-07 17:59:13.000000000 -0800 @@ -496,7 +496,7 @@ static int __init v850e_uart_init (void) port->ops = &v850e_uart_ops; port->line = chan; - port->iotype = SERIAL_IO_MEM; + port->iotype = UPIO_MEM; port->flags = UPF_BOOT_AUTOCONF; /* We actually use multiple IRQs, but the serial _