diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-02-20 03:02:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-02-20 03:02:17 -0800 |
| commit | da57b2aa0cda1845ad06712c937184cd938fb36e (patch) | |
| tree | d38c24eac416c41943239d5141fe7923cf597b5f /include/linux | |
| parent | a2f98d572ac1dd3461aaad3f823438d255e9c292 (diff) | |
| parent | 6dc30fc274e54ce93478e2a9ae12c10f36216f27 (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_core.h | 1 | ||||
| -rw-r--r-- | include/linux/serial_reg.h | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 8e09c20be413..da998dc9389d 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -46,6 +46,7 @@ * separate so any additions to the old serial.c that occur before * we are merged can be easily merged here. */ +#define PORT_PXA 31 #define PORT_AMBA 32 #define PORT_CLPS711X 33 #define PORT_SA1100 34 diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 947da230a189..f2fee651085f 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -141,6 +141,21 @@ #define UART_MSR_ANY_DELTA 0x0F /* Any of the delta bits! */ /* + * The Intel PXA2xx chip defines those bits + */ +#define UART_IER_DMAE 0x80 /* DMA Requests Enable */ +#define UART_IER_UUE 0x40 /* UART Unit Enable */ +#define UART_IER_NRZE 0x20 /* NRZ coding Enable */ +#define UART_IER_RTOIE 0x10 /* Receiver Time Out Interrupt Enable */ + +#define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */ + +#define UART_FCR_PXAR1 0x00 /* receive FIFO treshold = 1 */ +#define UART_FCR_PXAR8 0x40 /* receive FIFO treshold = 8 */ +#define UART_FCR_PXAR16 0x80 /* receive FIFO treshold = 16 */ +#define UART_FCR_PXAR32 0xc0 /* receive FIFO treshold = 32 */ + +/* * These are the definitions for the Extended Features Register * (StarTech 16C660 only, when DLAB=1) */ |