diff options
author | Graf Yang <graf.yang@analog.com> | 2008-10-13 05:33:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 12:51:38 -0400 |
commit | b3ef5aba64aed5be0fccca3ff39c8f2282111ce5 (patch) | |
tree | 6ffb27e1badbdc59a9d1564ff65003771ad5e97f /drivers/serial | |
parent | 5ffdeea2f99ed9d46bf954c9fdc64da7da57e81b (diff) |
Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART
We now use the sir_dev/irtty_sir/uart/bfin_serial drivers framework
to monitor the TX status.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/bfin_5xx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index 5e20f50342a9..a5cf0e70b3f6 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
@@ -761,6 +761,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, | |||
761 | val |= UCEN; | 761 | val |= UCEN; |
762 | UART_PUT_GCTL(uart, val); | 762 | UART_PUT_GCTL(uart, val); |
763 | 763 | ||
764 | /* Port speed changed, update the per-port timeout. */ | ||
765 | uart_update_timeout(port, termios->c_cflag, baud); | ||
766 | |||
764 | spin_unlock_irqrestore(&uart->port.lock, flags); | 767 | spin_unlock_irqrestore(&uart->port.lock, flags); |
765 | } | 768 | } |
766 | 769 | ||
@@ -865,6 +868,7 @@ static void __init bfin_serial_init_ports(void) | |||
865 | 868 | ||
866 | for (i = 0; i < nr_active_ports; i++) { | 869 | for (i = 0; i < nr_active_ports; i++) { |
867 | bfin_serial_ports[i].port.uartclk = get_sclk(); | 870 | bfin_serial_ports[i].port.uartclk = get_sclk(); |
871 | bfin_serial_ports[i].port.fifosize = BFIN_UART_TX_FIFO_SIZE; | ||
868 | bfin_serial_ports[i].port.ops = &bfin_serial_pops; | 872 | bfin_serial_ports[i].port.ops = &bfin_serial_pops; |
869 | bfin_serial_ports[i].port.line = i; | 873 | bfin_serial_ports[i].port.line = i; |
870 | bfin_serial_ports[i].port.iotype = UPIO_MEM; | 874 | bfin_serial_ports[i].port.iotype = UPIO_MEM; |