Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART
authorGraf Yang <graf.yang@analog.com>
Mon, 13 Oct 2008 09:33:42 +0000 (10:33 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Oct 2008 16:51:38 +0000 (09:51 -0700)
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>
arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h
arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h
arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h
arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h
arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h
drivers/serial/bfin_5xx.c

index a23d047508104441293f20bbdaf4b19141d58a87..75722d6008b0cade6651e72911d7bfdb3543cbf6 100644 (file)
@@ -78,6 +78,9 @@
 #  define CONFIG_UART1_RTS_PIN -1
 # endif
 #endif
+
+#define BFIN_UART_TX_FIFO_SIZE 2
+
 /*
  * The pin configuration is different from schematic
  */
index 20471cd5ebfe454f2b5487c1162bace17ffbf0b6..815bfe5dd1a99a74d06f1f86ef16c764ac990271 100644 (file)
@@ -69,6 +69,8 @@
 # endif
 #endif
 
+#define BFIN_UART_TX_FIFO_SIZE 2
+
 struct bfin_serial_port {
         struct uart_port        port;
         unsigned int            old_status;
index 08dfe30300b0898317fdf0b927293fe7e8da345f..b3f87e1d16a2f5ffa18156b35e76edc01c451870 100644 (file)
@@ -78,6 +78,9 @@
 #  define CONFIG_UART1_RTS_PIN -1
 # endif
 #endif
+
+#define BFIN_UART_TX_FIFO_SIZE 2
+
 /*
  * The pin configuration is different from schematic
  */
index 76976b17b530e8be7209b38db2b02d27133b2381..e4cf35e7ab9fd6c8a4adf80d10090e821a266ba3 100644 (file)
@@ -82,6 +82,9 @@
 #  define CONFIG_UART1_RTS_PIN -1
 # endif
 #endif
+
+#define BFIN_UART_TX_FIFO_SIZE 2
+
 /*
  * The pin configuration is different from schematic
  */
index 6cddca4aa182a65907014e3ebdd97d25ec50922e..e0ce0c1843d458bb28b6ee6e53eb9e7747e2566b 100644 (file)
@@ -69,6 +69,8 @@
 # endif
 #endif
 
+#define BFIN_UART_TX_FIFO_SIZE 2
+
 struct bfin_serial_port {
         struct uart_port        port;
         unsigned int            old_status;
index 5e20f50342a90a94390881a66dde1c81eb1cae2b..a5cf0e70b3f6bcbeafe851385fdfc816adf3b491 100644 (file)
@@ -761,6 +761,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        val |= UCEN;
        UART_PUT_GCTL(uart, val);
 
+       /* Port speed changed, update the per-port timeout. */
+       uart_update_timeout(port, termios->c_cflag, baud);
+
        spin_unlock_irqrestore(&uart->port.lock, flags);
 }
 
@@ -865,6 +868,7 @@ static void __init bfin_serial_init_ports(void)
 
        for (i = 0; i < nr_active_ports; i++) {
                bfin_serial_ports[i].port.uartclk   = get_sclk();
+               bfin_serial_ports[i].port.fifosize  = BFIN_UART_TX_FIFO_SIZE;
                bfin_serial_ports[i].port.ops       = &bfin_serial_pops;
                bfin_serial_ports[i].port.line      = i;
                bfin_serial_ports[i].port.iotype    = UPIO_MEM;