2008-07-14 13:50:30 +03:00
|
|
|
--- a/drivers/serial/8250.c
|
|
|
|
|
+++ b/drivers/serial/8250.c
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -266,6 +266,13 @@ static const struct serial8250_config ua
|
2008-07-14 13:50:30 +03:00
|
|
|
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
|
|
|
|
|
.flags = UART_CAP_FIFO,
|
|
|
|
|
},
|
|
|
|
|
+ [PORT_AR7] = {
|
|
|
|
|
+ .name = "TI-AR7",
|
|
|
|
|
+ .fifo_size = 16,
|
|
|
|
|
+ .tx_loadsz = 16,
|
|
|
|
|
+ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
|
|
|
|
|
+ .flags = UART_CAP_FIFO | UART_CAP_AFE,
|
|
|
|
|
+ },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#if defined (CONFIG_SERIAL_8250_AU1X00)
|
2008-11-06 22:55:33 +02:00
|
|
|
@@ -2524,7 +2531,11 @@ static void serial8250_console_putchar(s
|
2008-07-14 13:50:30 +03:00
|
|
|
{
|
|
|
|
|
struct uart_8250_port *up = (struct uart_8250_port *)port;
|
|
|
|
|
|
|
|
|
|
+#ifdef CONFIG_AR7
|
|
|
|
|
+ wait_for_xmitr(up, BOTH_EMPTY);
|
|
|
|
|
+#else
|
|
|
|
|
wait_for_xmitr(up, UART_LSR_THRE);
|
|
|
|
|
+#endif
|
|
|
|
|
serial_out(up, UART_TX, ch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--- a/include/linux/serial_core.h
|
|
|
|
|
+++ b/include/linux/serial_core.h
|
|
|
|
|
@@ -40,7 +40,8 @@
|
|
|
|
|
#define PORT_NS16550A 14
|
|
|
|
|
#define PORT_XSCALE 15
|
|
|
|
|
#define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */
|
|
|
|
|
-#define PORT_MAX_8250 16 /* max port ID */
|
|
|
|
|
+#define PORT_AR7 17
|
|
|
|
|
+#define PORT_MAX_8250 17 /* max port ID */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ARM specific type numbers. These are not currently guaranteed
|
