git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'copy_user' of git://git.marvell.com/orion into devel
[sfrench/cifs-2.6.git]
/
include
/
linux
/
amba
/
serial.h
diff --git
a/include/linux/amba/serial.h
b/include/linux/amba/serial.h
index 48ee32a18ac5e798f34b29dc69561dd95c0f9830..42949e210cb873298ed73335bb81370e8533d3cb 100644
(file)
--- a/
include/linux/amba/serial.h
+++ b/
include/linux/amba/serial.h
@@
-114,6
+114,9
@@
#define UART011_IFLS_TX4_8 (2 << 0)
#define UART011_IFLS_TX6_8 (3 << 0)
#define UART011_IFLS_TX7_8 (4 << 0)
#define UART011_IFLS_TX4_8 (2 << 0)
#define UART011_IFLS_TX6_8 (3 << 0)
#define UART011_IFLS_TX7_8 (4 << 0)
+/* special values for ST vendor with deeper fifo */
+#define UART011_IFLS_RX_HALF (5 << 3)
+#define UART011_IFLS_TX_HALF (5 << 0)
#define UART011_OEIM (1 << 10) /* overrun error interrupt mask */
#define UART011_BEIM (1 << 9) /* break error interrupt mask */
#define UART011_OEIM (1 << 10) /* overrun error interrupt mask */
#define UART011_BEIM (1 << 9) /* break error interrupt mask */