diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/21285.c | 2 | ||||
-rw-r--r-- | drivers/serial/8250.c | 1 | ||||
-rw-r--r-- | drivers/serial/8250_au1x00.c | 1 | ||||
-rw-r--r-- | drivers/serial/8250_pci.c | 4 | ||||
-rw-r--r-- | drivers/serial/amba-pl010.c | 4 | ||||
-rw-r--r-- | drivers/serial/au1x00_uart.c | 12 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 25 | ||||
-rw-r--r-- | drivers/serial/dz.c | 3 | ||||
-rw-r--r-- | drivers/serial/imx.c | 4 | ||||
-rw-r--r-- | drivers/serial/ip22zilog.c | 8 | ||||
-rw-r--r-- | drivers/serial/m32r_sio.c | 2 | ||||
-rw-r--r-- | drivers/serial/mux.c | 2 | ||||
-rw-r--r-- | drivers/serial/pmac_zilog.c | 2 | ||||
-rw-r--r-- | drivers/serial/sa1100.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_lh7a40x.c | 6 | ||||
-rw-r--r-- | drivers/serial/sh-sci.c | 20 | ||||
-rw-r--r-- | drivers/serial/sunsab.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsu.c | 10 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 4 | ||||
-rw-r--r-- | drivers/serial/v850e_uart.c | 2 |
20 files changed, 58 insertions, 58 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 7aef7518b0d1..8c5c276c5577 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
@@ -362,7 +362,7 @@ static struct uart_ops serial21285_ops = { | |||
362 | 362 | ||
363 | static struct uart_port serial21285_port = { | 363 | static struct uart_port serial21285_port = { |
364 | .mapbase = 0x42000160, | 364 | .mapbase = 0x42000160, |
365 | .iotype = SERIAL_IO_MEM, | 365 | .iotype = UPIO_MEM, |
366 | .irq = NO_IRQ, | 366 | .irq = NO_IRQ, |
367 | .fifosize = 16, | 367 | .fifosize = 16, |
368 | .ops = &serial21285_ops, | 368 | .ops = &serial21285_ops, |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 179c1f065e60..b1fc97d5f643 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -2229,6 +2229,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count) | |||
2229 | * and restore the IER | 2229 | * and restore the IER |
2230 | */ | 2230 | */ |
2231 | wait_for_xmitr(up, BOTH_EMPTY); | 2231 | wait_for_xmitr(up, BOTH_EMPTY); |
2232 | up->ier |= UART_IER_THRI; | ||
2232 | serial_out(up, UART_IER, ier | UART_IER_THRI); | 2233 | serial_out(up, UART_IER, ier | UART_IER_THRI); |
2233 | } | 2234 | } |
2234 | 2235 | ||
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c index 06ae8fbcc947..8d8d7a70d03e 100644 --- a/drivers/serial/8250_au1x00.c +++ b/drivers/serial/8250_au1x00.c | |||
@@ -56,7 +56,6 @@ static struct plat_serial8250_port au1x00_data[] = { | |||
56 | #elif defined(CONFIG_SOC_AU1550) | 56 | #elif defined(CONFIG_SOC_AU1550) |
57 | PORT(UART0_ADDR, AU1550_UART0_INT), | 57 | PORT(UART0_ADDR, AU1550_UART0_INT), |
58 | PORT(UART1_ADDR, AU1550_UART1_INT), | 58 | PORT(UART1_ADDR, AU1550_UART1_INT), |
59 | PORT(UART2_ADDR, AU1550_UART2_INT), | ||
60 | PORT(UART3_ADDR, AU1550_UART3_INT), | 59 | PORT(UART3_ADDR, AU1550_UART3_INT), |
61 | #elif defined(CONFIG_SOC_AU1200) | 60 | #elif defined(CONFIG_SOC_AU1200) |
62 | PORT(UART0_ADDR, AU1200_UART0_INT), | 61 | PORT(UART0_ADDR, AU1200_UART0_INT), |
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index bb9ec28ccc2b..94886c000d2a 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -1882,6 +1882,10 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
1882 | PCI_SUBVENDOR_ID_CONNECT_TECH, | 1882 | PCI_SUBVENDOR_ID_CONNECT_TECH, |
1883 | PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4, 0, 0, | 1883 | PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4, 0, 0, |
1884 | pbn_b0_4_1843200 }, | 1884 | pbn_b0_4_1843200 }, |
1885 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954, | ||
1886 | PCI_VENDOR_ID_AFAVLAB, | ||
1887 | PCI_SUBDEVICE_ID_AFAVLAB_P061, 0, 0, | ||
1888 | pbn_b0_4_1152000 }, | ||
1885 | { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152, | 1889 | { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152, |
1886 | PCI_SUBVENDOR_ID_CONNECT_TECH, | 1890 | PCI_SUBVENDOR_ID_CONNECT_TECH, |
1887 | PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232, 0, 0, | 1891 | PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232, 0, 0, |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 429de2723a1c..321a3b3a5728 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
@@ -561,7 +561,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
561 | .port = { | 561 | .port = { |
562 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE), | 562 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART0_BASE), |
563 | .mapbase = INTEGRATOR_UART0_BASE, | 563 | .mapbase = INTEGRATOR_UART0_BASE, |
564 | .iotype = SERIAL_IO_MEM, | 564 | .iotype = UPIO_MEM, |
565 | .irq = IRQ_UARTINT0, | 565 | .irq = IRQ_UARTINT0, |
566 | .uartclk = 14745600, | 566 | .uartclk = 14745600, |
567 | .fifosize = 16, | 567 | .fifosize = 16, |
@@ -576,7 +576,7 @@ static struct uart_amba_port amba_ports[UART_NR] = { | |||
576 | .port = { | 576 | .port = { |
577 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE), | 577 | .membase = (void *)IO_ADDRESS(INTEGRATOR_UART1_BASE), |
578 | .mapbase = INTEGRATOR_UART1_BASE, | 578 | .mapbase = INTEGRATOR_UART1_BASE, |
579 | .iotype = SERIAL_IO_MEM, | 579 | .iotype = UPIO_MEM, |
580 | .irq = IRQ_UARTINT1, | 580 | .irq = IRQ_UARTINT1, |
581 | .uartclk = 14745600, | 581 | .uartclk = 14745600, |
582 | .fifosize = 16, | 582 | .fifosize = 16, |
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c index ceb5d7f37bbd..344022fe53ef 100644 --- a/drivers/serial/au1x00_uart.c +++ b/drivers/serial/au1x00_uart.c | |||
@@ -892,7 +892,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res | |||
892 | int ret = 0; | 892 | int ret = 0; |
893 | 893 | ||
894 | switch (up->port.iotype) { | 894 | switch (up->port.iotype) { |
895 | case SERIAL_IO_MEM: | 895 | case UPIO_MEM: |
896 | if (up->port.mapbase) { | 896 | if (up->port.mapbase) { |
897 | *res = request_mem_region(up->port.mapbase, size, "serial"); | 897 | *res = request_mem_region(up->port.mapbase, size, "serial"); |
898 | if (!*res) | 898 | if (!*res) |
@@ -900,8 +900,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res | |||
900 | } | 900 | } |
901 | break; | 901 | break; |
902 | 902 | ||
903 | case SERIAL_IO_HUB6: | 903 | case UPIO_HUB6: |
904 | case SERIAL_IO_PORT: | 904 | case UPIO_PORT: |
905 | *res = request_region(up->port.iobase, size, "serial"); | 905 | *res = request_region(up->port.iobase, size, "serial"); |
906 | if (!*res) | 906 | if (!*res) |
907 | ret = -EBUSY; | 907 | ret = -EBUSY; |
@@ -919,7 +919,7 @@ static void serial8250_release_port(struct uart_port *port) | |||
919 | size <<= up->port.regshift; | 919 | size <<= up->port.regshift; |
920 | 920 | ||
921 | switch (up->port.iotype) { | 921 | switch (up->port.iotype) { |
922 | case SERIAL_IO_MEM: | 922 | case UPIO_MEM: |
923 | if (up->port.mapbase) { | 923 | if (up->port.mapbase) { |
924 | /* | 924 | /* |
925 | * Unmap the area. | 925 | * Unmap the area. |
@@ -935,8 +935,8 @@ static void serial8250_release_port(struct uart_port *port) | |||
935 | } | 935 | } |
936 | break; | 936 | break; |
937 | 937 | ||
938 | case SERIAL_IO_HUB6: | 938 | case UPIO_HUB6: |
939 | case SERIAL_IO_PORT: | 939 | case UPIO_PORT: |
940 | start = up->port.iobase; | 940 | start = up->port.iobase; |
941 | 941 | ||
942 | if (size) | 942 | if (size) |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 16af5626c243..b7bf4c698a47 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -252,12 +252,9 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
252 | /* If we have not enough room in tty flip buffer, then we try | 252 | /* If we have not enough room in tty flip buffer, then we try |
253 | * later, which will be the next rx-interrupt or a timeout | 253 | * later, which will be the next rx-interrupt or a timeout |
254 | */ | 254 | */ |
255 | if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { | 255 | if(tty_buffer_request_room(tty, i) < i) { |
256 | tty->flip.work.func((void *)tty); | 256 | printk(KERN_WARNING "No room in flip buffer\n"); |
257 | if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { | 257 | return; |
258 | printk(KERN_WARNING "TTY_DONT_FLIP set\n"); | ||
259 | return; | ||
260 | } | ||
261 | } | 258 | } |
262 | 259 | ||
263 | /* get pointer */ | 260 | /* get pointer */ |
@@ -276,9 +273,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
276 | continue; | 273 | continue; |
277 | 274 | ||
278 | error_return: | 275 | error_return: |
279 | *tty->flip.char_buf_ptr++ = ch; | 276 | tty_insert_flip_char(tty, ch, flg); |
280 | *tty->flip.flag_buf_ptr++ = flg; | ||
281 | tty->flip.count++; | ||
282 | 277 | ||
283 | } /* End while (i--) */ | 278 | } /* End while (i--) */ |
284 | 279 | ||
@@ -908,7 +903,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
908 | .port = { | 903 | .port = { |
909 | .irq = SMC1_IRQ, | 904 | .irq = SMC1_IRQ, |
910 | .ops = &cpm_uart_pops, | 905 | .ops = &cpm_uart_pops, |
911 | .iotype = SERIAL_IO_MEM, | 906 | .iotype = UPIO_MEM, |
912 | .lock = SPIN_LOCK_UNLOCKED, | 907 | .lock = SPIN_LOCK_UNLOCKED, |
913 | }, | 908 | }, |
914 | .flags = FLAG_SMC, | 909 | .flags = FLAG_SMC, |
@@ -922,7 +917,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
922 | .port = { | 917 | .port = { |
923 | .irq = SMC2_IRQ, | 918 | .irq = SMC2_IRQ, |
924 | .ops = &cpm_uart_pops, | 919 | .ops = &cpm_uart_pops, |
925 | .iotype = SERIAL_IO_MEM, | 920 | .iotype = UPIO_MEM, |
926 | .lock = SPIN_LOCK_UNLOCKED, | 921 | .lock = SPIN_LOCK_UNLOCKED, |
927 | }, | 922 | }, |
928 | .flags = FLAG_SMC, | 923 | .flags = FLAG_SMC, |
@@ -939,7 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
939 | .port = { | 934 | .port = { |
940 | .irq = SCC1_IRQ, | 935 | .irq = SCC1_IRQ, |
941 | .ops = &cpm_uart_pops, | 936 | .ops = &cpm_uart_pops, |
942 | .iotype = SERIAL_IO_MEM, | 937 | .iotype = UPIO_MEM, |
943 | .lock = SPIN_LOCK_UNLOCKED, | 938 | .lock = SPIN_LOCK_UNLOCKED, |
944 | }, | 939 | }, |
945 | .tx_nrfifos = TX_NUM_FIFO, | 940 | .tx_nrfifos = TX_NUM_FIFO, |
@@ -953,7 +948,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
953 | .port = { | 948 | .port = { |
954 | .irq = SCC2_IRQ, | 949 | .irq = SCC2_IRQ, |
955 | .ops = &cpm_uart_pops, | 950 | .ops = &cpm_uart_pops, |
956 | .iotype = SERIAL_IO_MEM, | 951 | .iotype = UPIO_MEM, |
957 | .lock = SPIN_LOCK_UNLOCKED, | 952 | .lock = SPIN_LOCK_UNLOCKED, |
958 | }, | 953 | }, |
959 | .tx_nrfifos = TX_NUM_FIFO, | 954 | .tx_nrfifos = TX_NUM_FIFO, |
@@ -967,7 +962,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
967 | .port = { | 962 | .port = { |
968 | .irq = SCC3_IRQ, | 963 | .irq = SCC3_IRQ, |
969 | .ops = &cpm_uart_pops, | 964 | .ops = &cpm_uart_pops, |
970 | .iotype = SERIAL_IO_MEM, | 965 | .iotype = UPIO_MEM, |
971 | .lock = SPIN_LOCK_UNLOCKED, | 966 | .lock = SPIN_LOCK_UNLOCKED, |
972 | }, | 967 | }, |
973 | .tx_nrfifos = TX_NUM_FIFO, | 968 | .tx_nrfifos = TX_NUM_FIFO, |
@@ -981,7 +976,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
981 | .port = { | 976 | .port = { |
982 | .irq = SCC4_IRQ, | 977 | .irq = SCC4_IRQ, |
983 | .ops = &cpm_uart_pops, | 978 | .ops = &cpm_uart_pops, |
984 | .iotype = SERIAL_IO_MEM, | 979 | .iotype = UPIO_MEM, |
985 | .lock = SPIN_LOCK_UNLOCKED, | 980 | .lock = SPIN_LOCK_UNLOCKED, |
986 | }, | 981 | }, |
987 | .tx_nrfifos = TX_NUM_FIFO, | 982 | .tx_nrfifos = TX_NUM_FIFO, |
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c index a64ba26a94e8..ba5541de673b 100644 --- a/drivers/serial/dz.c +++ b/drivers/serial/dz.c | |||
@@ -262,6 +262,7 @@ static inline void dz_receive_chars(struct dz_port *dport) | |||
262 | } | 262 | } |
263 | tty_insert_flip_char(tty, ch, flag); | 263 | tty_insert_flip_char(tty, ch, flag); |
264 | ignore_char: | 264 | ignore_char: |
265 | ; | ||
265 | } while (status & DZ_DVAL); | 266 | } while (status & DZ_DVAL); |
266 | 267 | ||
267 | if (tty) | 268 | if (tty) |
@@ -650,7 +651,7 @@ static void __init dz_init_ports(void) | |||
650 | for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) { | 651 | for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) { |
651 | spin_lock_init(&dport->port.lock); | 652 | spin_lock_init(&dport->port.lock); |
652 | dport->port.membase = (char *) base; | 653 | dport->port.membase = (char *) base; |
653 | dport->port.iotype = SERIAL_IO_PORT; | 654 | dport->port.iotype = UPIO_PORT; |
654 | dport->port.irq = dec_interrupt[DEC_IRQ_DZ11]; | 655 | dport->port.irq = dec_interrupt[DEC_IRQ_DZ11]; |
655 | dport->port.line = i; | 656 | dport->port.line = i; |
656 | dport->port.fifosize = 1; | 657 | dport->port.fifosize = 1; |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 858048efe1ed..4d53fb5ca87b 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -668,7 +668,7 @@ static struct imx_port imx_ports[] = { | |||
668 | .rtsirq = UART1_MINT_RTS, | 668 | .rtsirq = UART1_MINT_RTS, |
669 | .port = { | 669 | .port = { |
670 | .type = PORT_IMX, | 670 | .type = PORT_IMX, |
671 | .iotype = SERIAL_IO_MEM, | 671 | .iotype = UPIO_MEM, |
672 | .membase = (void *)IMX_UART1_BASE, | 672 | .membase = (void *)IMX_UART1_BASE, |
673 | .mapbase = IMX_UART1_BASE, /* FIXME */ | 673 | .mapbase = IMX_UART1_BASE, /* FIXME */ |
674 | .irq = UART1_MINT_RX, | 674 | .irq = UART1_MINT_RX, |
@@ -684,7 +684,7 @@ static struct imx_port imx_ports[] = { | |||
684 | .rtsirq = UART2_MINT_RTS, | 684 | .rtsirq = UART2_MINT_RTS, |
685 | .port = { | 685 | .port = { |
686 | .type = PORT_IMX, | 686 | .type = PORT_IMX, |
687 | .iotype = SERIAL_IO_MEM, | 687 | .iotype = UPIO_MEM, |
688 | .membase = (void *)IMX_UART2_BASE, | 688 | .membase = (void *)IMX_UART2_BASE, |
689 | .mapbase = IMX_UART2_BASE, /* FIXME */ | 689 | .mapbase = IMX_UART2_BASE, /* FIXME */ |
690 | .irq = UART2_MINT_RX, | 690 | .irq = UART2_MINT_RX, |
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 66f117d15065..419dd3cd7862 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c | |||
@@ -215,7 +215,7 @@ static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs) | |||
215 | /* Lower and upper byte of baud rate generator divisor. */ | 215 | /* Lower and upper byte of baud rate generator divisor. */ |
216 | write_zsreg(channel, R12, regs[R12]); | 216 | write_zsreg(channel, R12, regs[R12]); |
217 | write_zsreg(channel, R13, regs[R13]); | 217 | write_zsreg(channel, R13, regs[R13]); |
218 | 218 | ||
219 | /* Now rewrite R14, with BRENAB (if set). */ | 219 | /* Now rewrite R14, with BRENAB (if set). */ |
220 | write_zsreg(channel, R14, regs[R14]); | 220 | write_zsreg(channel, R14, regs[R14]); |
221 | 221 | ||
@@ -571,7 +571,7 @@ static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl) | |||
571 | else | 571 | else |
572 | clear_bits |= DTR; | 572 | clear_bits |= DTR; |
573 | 573 | ||
574 | /* NOTE: Not subject to 'transmitter active' rule. */ | 574 | /* NOTE: Not subject to 'transmitter active' rule. */ |
575 | up->curregs[R5] |= set_bits; | 575 | up->curregs[R5] |= set_bits; |
576 | up->curregs[R5] &= ~clear_bits; | 576 | up->curregs[R5] &= ~clear_bits; |
577 | write_zsreg(channel, R5, up->curregs[R5]); | 577 | write_zsreg(channel, R5, up->curregs[R5]); |
@@ -654,7 +654,7 @@ static void ip22zilog_enable_ms(struct uart_port *port) | |||
654 | if (new_reg != up->curregs[R15]) { | 654 | if (new_reg != up->curregs[R15]) { |
655 | up->curregs[R15] = new_reg; | 655 | up->curregs[R15] = new_reg; |
656 | 656 | ||
657 | /* NOTE: Not subject to 'transmitter active' rule. */ | 657 | /* NOTE: Not subject to 'transmitter active' rule. */ |
658 | write_zsreg(channel, R15, up->curregs[R15]); | 658 | write_zsreg(channel, R15, up->curregs[R15]); |
659 | } | 659 | } |
660 | } | 660 | } |
@@ -680,7 +680,7 @@ static void ip22zilog_break_ctl(struct uart_port *port, int break_state) | |||
680 | if (new_reg != up->curregs[R5]) { | 680 | if (new_reg != up->curregs[R5]) { |
681 | up->curregs[R5] = new_reg; | 681 | up->curregs[R5] = new_reg; |
682 | 682 | ||
683 | /* NOTE: Not subject to 'transmitter active' rule. */ | 683 | /* NOTE: Not subject to 'transmitter active' rule. */ |
684 | write_zsreg(channel, R5, up->curregs[R5]); | 684 | write_zsreg(channel, R5, up->curregs[R5]); |
685 | } | 685 | } |
686 | 686 | ||
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index b48066a64a7d..242a04104393 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -80,7 +80,7 @@ | |||
80 | #include <asm/serial.h> | 80 | #include <asm/serial.h> |
81 | 81 | ||
82 | /* Standard COM flags */ | 82 | /* Standard COM flags */ |
83 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) | 83 | #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) |
84 | 84 | ||
85 | /* | 85 | /* |
86 | * SERIAL_PORT_DFNS tells us about built-in ports that have no | 86 | * SERIAL_PORT_DFNS tells us about built-in ports that have no |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 4e49168c3176..868eaf4a1a68 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -462,7 +462,7 @@ static int __init mux_probe(struct parisc_device *dev) | |||
462 | port->mapbase = dev->hpa.start + MUX_OFFSET + | 462 | port->mapbase = dev->hpa.start + MUX_OFFSET + |
463 | (i * MUX_LINE_OFFSET); | 463 | (i * MUX_LINE_OFFSET); |
464 | port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET); | 464 | port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET); |
465 | port->iotype = SERIAL_IO_MEM; | 465 | port->iotype = UPIO_MEM; |
466 | port->type = PORT_MUX; | 466 | port->type = PORT_MUX; |
467 | port->irq = NO_IRQ; | 467 | port->irq = NO_IRQ; |
468 | port->uartclk = 0; | 468 | port->uartclk = 0; |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4e03a87f3fb4..9b7ed58cb53b 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -1492,7 +1492,7 @@ no_dma: | |||
1492 | /* | 1492 | /* |
1493 | * Init remaining bits of "port" structure | 1493 | * Init remaining bits of "port" structure |
1494 | */ | 1494 | */ |
1495 | uap->port.iotype = SERIAL_IO_MEM; | 1495 | uap->port.iotype = UPIO_MEM; |
1496 | uap->port.irq = np->intrs[0].line; | 1496 | uap->port.irq = np->intrs[0].line; |
1497 | uap->port.uartclk = ZS_CLOCK; | 1497 | uap->port.uartclk = ZS_CLOCK; |
1498 | uap->port.fifosize = 1; | 1498 | uap->port.fifosize = 1; |
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index ff7b60b4de37..2c00b8625852 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
@@ -628,7 +628,7 @@ static void __init sa1100_init_ports(void) | |||
628 | sa1100_ports[i].port.ops = &sa1100_pops; | 628 | sa1100_ports[i].port.ops = &sa1100_pops; |
629 | sa1100_ports[i].port.fifosize = 8; | 629 | sa1100_ports[i].port.fifosize = 8; |
630 | sa1100_ports[i].port.line = i; | 630 | sa1100_ports[i].port.line = i; |
631 | sa1100_ports[i].port.iotype = SERIAL_IO_MEM; | 631 | sa1100_ports[i].port.iotype = UPIO_MEM; |
632 | init_timer(&sa1100_ports[i].timer); | 632 | init_timer(&sa1100_ports[i].timer); |
633 | sa1100_ports[i].timer.function = sa1100_timeout; | 633 | sa1100_ports[i].timer.function = sa1100_timeout; |
634 | sa1100_ports[i].timer.data = (unsigned long)&sa1100_ports[i]; | 634 | sa1100_ports[i].timer.data = (unsigned long)&sa1100_ports[i]; |
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index d0490f67f597..04186eaae227 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
@@ -501,7 +501,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
501 | .port = { | 501 | .port = { |
502 | .membase = (void*) io_p2v (UART1_PHYS), | 502 | .membase = (void*) io_p2v (UART1_PHYS), |
503 | .mapbase = UART1_PHYS, | 503 | .mapbase = UART1_PHYS, |
504 | .iotype = SERIAL_IO_MEM, | 504 | .iotype = UPIO_MEM, |
505 | .irq = IRQ_UART1INTR, | 505 | .irq = IRQ_UART1INTR, |
506 | .uartclk = 14745600/2, | 506 | .uartclk = 14745600/2, |
507 | .fifosize = 16, | 507 | .fifosize = 16, |
@@ -514,7 +514,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
514 | .port = { | 514 | .port = { |
515 | .membase = (void*) io_p2v (UART2_PHYS), | 515 | .membase = (void*) io_p2v (UART2_PHYS), |
516 | .mapbase = UART2_PHYS, | 516 | .mapbase = UART2_PHYS, |
517 | .iotype = SERIAL_IO_MEM, | 517 | .iotype = UPIO_MEM, |
518 | .irq = IRQ_UART2INTR, | 518 | .irq = IRQ_UART2INTR, |
519 | .uartclk = 14745600/2, | 519 | .uartclk = 14745600/2, |
520 | .fifosize = 16, | 520 | .fifosize = 16, |
@@ -527,7 +527,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = { | |||
527 | .port = { | 527 | .port = { |
528 | .membase = (void*) io_p2v (UART3_PHYS), | 528 | .membase = (void*) io_p2v (UART3_PHYS), |
529 | .mapbase = UART3_PHYS, | 529 | .mapbase = UART3_PHYS, |
530 | .iotype = SERIAL_IO_MEM, | 530 | .iotype = UPIO_MEM, |
531 | .irq = IRQ_UART3INTR, | 531 | .irq = IRQ_UART3INTR, |
532 | .uartclk = 14745600/2, | 532 | .uartclk = 14745600/2, |
533 | .fifosize = 16, | 533 | .fifosize = 16, |
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, |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 8bcaebcc0ad7..85664228a0b6 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
@@ -1036,7 +1036,7 @@ static void __init sab_attach_callback(struct linux_ebus_device *edev, void *arg | |||
1036 | up->port.irq = edev->irqs[0]; | 1036 | up->port.irq = edev->irqs[0]; |
1037 | up->port.fifosize = SAB82532_XMIT_FIFO_SIZE; | 1037 | up->port.fifosize = SAB82532_XMIT_FIFO_SIZE; |
1038 | up->port.mapbase = (unsigned long)up->regs; | 1038 | up->port.mapbase = (unsigned long)up->regs; |
1039 | up->port.iotype = SERIAL_IO_MEM; | 1039 | up->port.iotype = UPIO_MEM; |
1040 | 1040 | ||
1041 | writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc); | 1041 | writeb(SAB82532_IPC_IC_ACT_LOW, &up->regs->w.ipc); |
1042 | 1042 | ||
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index bc67442c6b4c..308704566948 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -109,11 +109,11 @@ static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset) | |||
109 | offset <<= up->port.regshift; | 109 | offset <<= up->port.regshift; |
110 | 110 | ||
111 | switch (up->port.iotype) { | 111 | switch (up->port.iotype) { |
112 | case SERIAL_IO_HUB6: | 112 | case UPIO_HUB6: |
113 | outb(up->port.hub6 - 1 + offset, up->port.iobase); | 113 | outb(up->port.hub6 - 1 + offset, up->port.iobase); |
114 | return inb(up->port.iobase + 1); | 114 | return inb(up->port.iobase + 1); |
115 | 115 | ||
116 | case SERIAL_IO_MEM: | 116 | case UPIO_MEM: |
117 | return readb(up->port.membase + offset); | 117 | return readb(up->port.membase + offset); |
118 | 118 | ||
119 | default: | 119 | default: |
@@ -139,12 +139,12 @@ serial_out(struct uart_sunsu_port *up, int offset, int value) | |||
139 | offset <<= up->port.regshift; | 139 | offset <<= up->port.regshift; |
140 | 140 | ||
141 | switch (up->port.iotype) { | 141 | switch (up->port.iotype) { |
142 | case SERIAL_IO_HUB6: | 142 | case UPIO_HUB6: |
143 | outb(up->port.hub6 - 1 + offset, up->port.iobase); | 143 | outb(up->port.hub6 - 1 + offset, up->port.iobase); |
144 | outb(value, up->port.iobase + 1); | 144 | outb(value, up->port.iobase + 1); |
145 | break; | 145 | break; |
146 | 146 | ||
147 | case SERIAL_IO_MEM: | 147 | case UPIO_MEM: |
148 | writeb(value, up->port.membase + offset); | 148 | writeb(value, up->port.membase + offset); |
149 | break; | 149 | break; |
150 | 150 | ||
@@ -1052,7 +1052,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up) | |||
1052 | return; | 1052 | return; |
1053 | 1053 | ||
1054 | up->type_probed = PORT_UNKNOWN; | 1054 | up->type_probed = PORT_UNKNOWN; |
1055 | up->port.iotype = SERIAL_IO_MEM; | 1055 | up->port.iotype = UPIO_MEM; |
1056 | 1056 | ||
1057 | /* | 1057 | /* |
1058 | * First we look for Ebus-bases su's | 1058 | * First we look for Ebus-bases su's |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 3c72484adea7..5cc4d4c2935c 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1487,7 +1487,7 @@ static void __init sunzilog_prepare(void) | |||
1487 | up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB; | 1487 | up[(chip * 2) + 1].port.membase = (void __iomem *)&rp->channelB; |
1488 | 1488 | ||
1489 | /* Channel A */ | 1489 | /* Channel A */ |
1490 | up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM; | 1490 | up[(chip * 2) + 0].port.iotype = UPIO_MEM; |
1491 | up[(chip * 2) + 0].port.irq = zilog_irq; | 1491 | up[(chip * 2) + 0].port.irq = zilog_irq; |
1492 | up[(chip * 2) + 0].port.uartclk = ZS_CLOCK; | 1492 | up[(chip * 2) + 0].port.uartclk = ZS_CLOCK; |
1493 | up[(chip * 2) + 0].port.fifosize = 1; | 1493 | up[(chip * 2) + 0].port.fifosize = 1; |
@@ -1498,7 +1498,7 @@ static void __init sunzilog_prepare(void) | |||
1498 | up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A; | 1498 | up[(chip * 2) + 0].flags |= SUNZILOG_FLAG_IS_CHANNEL_A; |
1499 | 1499 | ||
1500 | /* Channel B */ | 1500 | /* Channel B */ |
1501 | up[(chip * 2) + 1].port.iotype = SERIAL_IO_MEM; | 1501 | up[(chip * 2) + 1].port.iotype = UPIO_MEM; |
1502 | up[(chip * 2) + 1].port.irq = zilog_irq; | 1502 | up[(chip * 2) + 1].port.irq = zilog_irq; |
1503 | up[(chip * 2) + 1].port.uartclk = ZS_CLOCK; | 1503 | up[(chip * 2) + 1].port.uartclk = ZS_CLOCK; |
1504 | up[(chip * 2) + 1].port.fifosize = 1; | 1504 | up[(chip * 2) + 1].port.fifosize = 1; |
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c index 9378895a8d56..df705fda4243 100644 --- a/drivers/serial/v850e_uart.c +++ b/drivers/serial/v850e_uart.c | |||
@@ -496,7 +496,7 @@ static int __init v850e_uart_init (void) | |||
496 | 496 | ||
497 | port->ops = &v850e_uart_ops; | 497 | port->ops = &v850e_uart_ops; |
498 | port->line = chan; | 498 | port->line = chan; |
499 | port->iotype = SERIAL_IO_MEM; | 499 | port->iotype = UPIO_MEM; |
500 | port->flags = UPF_BOOT_AUTOCONF; | 500 | port->flags = UPF_BOOT_AUTOCONF; |
501 | 501 | ||
502 | /* We actually use multiple IRQs, but the serial | 502 | /* We actually use multiple IRQs, but the serial |