aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
blob: 446b2b555c6f8a216504c0fe3df7c72e60a58fe8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Index: linux-2.6.23-rc6/drivers/serial/8250.c
===================================================================
--- linux-2.6.23-rc6.orig/drivers/serial/8250.c	2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/drivers/serial/8250.c	2007-09-21 16:24:14.000000000 +0800
@@ -267,6 +267,13 @@
 		.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)
@@ -2453,7 +2460,11 @@
 {
 	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);
 }
 
Index: linux-2.6.23-rc6/include/linux/serial_core.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/serial_core.h	2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/serial_core.h	2007-09-21 16:24:14.000000000 +0800
@@ -40,6 +40,7 @@
 #define PORT_NS16550A	14
 #define PORT_XSCALE	15
 #define PORT_RM9000	16	/* PMC-Sierra RM9xxx internal UART */
+#define PORT_AR7	16
 #define PORT_MAX_8250	16	/* max port ID */
 
 /*
Index: linux-2.6.23-rc6/include/linux/serialP.h
===================================================================
--- linux-2.6.23-rc6.orig/include/linux/serialP.h	2007-09-21 16:23:51.000000000 +0800
+++ linux-2.6.23-rc6/include/linux/serialP.h	2007-09-21 16:24:14.000000000 +0800
@@ -135,6 +135,10 @@
  * the interrupt line _up_ instead of down, so if we register the IRQ
  * while the UART is in that state, we die in an IRQ storm. */
 #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#elif defined(CONFIG_AR7)
+/* This is how it is set up by bootloader... */
+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
+			| UART_MCR_RTS | UART_MCR_DTR)
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif