Commit b3ef5aba authored by Graf Yang's avatar Graf Yang Committed by Linus Torvalds

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: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ffdeea2
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
# define CONFIG_UART1_RTS_PIN -1 # define CONFIG_UART1_RTS_PIN -1
# endif # endif
#endif #endif
#define BFIN_UART_TX_FIFO_SIZE 2
/* /*
* The pin configuration is different from schematic * The pin configuration is different from schematic
*/ */
......
...@@ -69,6 +69,8 @@ ...@@ -69,6 +69,8 @@
# endif # endif
#endif #endif
#define BFIN_UART_TX_FIFO_SIZE 2
struct bfin_serial_port { struct bfin_serial_port {
struct uart_port port; struct uart_port port;
unsigned int old_status; unsigned int old_status;
......
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
# define CONFIG_UART1_RTS_PIN -1 # define CONFIG_UART1_RTS_PIN -1
# endif # endif
#endif #endif
#define BFIN_UART_TX_FIFO_SIZE 2
/* /*
* The pin configuration is different from schematic * The pin configuration is different from schematic
*/ */
......
...@@ -82,6 +82,9 @@ ...@@ -82,6 +82,9 @@
# define CONFIG_UART1_RTS_PIN -1 # define CONFIG_UART1_RTS_PIN -1
# endif # endif
#endif #endif
#define BFIN_UART_TX_FIFO_SIZE 2
/* /*
* The pin configuration is different from schematic * The pin configuration is different from schematic
*/ */
......
...@@ -69,6 +69,8 @@ ...@@ -69,6 +69,8 @@
# endif # endif
#endif #endif
#define BFIN_UART_TX_FIFO_SIZE 2
struct bfin_serial_port { struct bfin_serial_port {
struct uart_port port; struct uart_port port;
unsigned int old_status; unsigned int old_status;
......
...@@ -761,6 +761,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -761,6 +761,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
val |= UCEN; val |= UCEN;
UART_PUT_GCTL(uart, val); 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); spin_unlock_irqrestore(&uart->port.lock, flags);
} }
...@@ -865,6 +868,7 @@ static void __init bfin_serial_init_ports(void) ...@@ -865,6 +868,7 @@ static void __init bfin_serial_init_ports(void)
for (i = 0; i < nr_active_ports; i++) { for (i = 0; i < nr_active_ports; i++) {
bfin_serial_ports[i].port.uartclk = get_sclk(); 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.ops = &bfin_serial_pops;
bfin_serial_ports[i].port.line = i; bfin_serial_ports[i].port.line = i;
bfin_serial_ports[i].port.iotype = UPIO_MEM; bfin_serial_ports[i].port.iotype = UPIO_MEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment