Skip to content

Commit 7e12357

Browse files
jan-kiszkagregkh
authored andcommitted
serial: exar: Move register defines from uapi header to consumer site
None of these registers is relevant for the userspace API. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0d560a1 commit 7e12357

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

drivers/tty/serial/8250/8250_exar.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@
3434
#define PCI_DEVICE_ID_EXAR_XR17V4358 0x4358
3535
#define PCI_DEVICE_ID_EXAR_XR17V8358 0x8358
3636

37+
#define UART_EXAR_8XMODE 0x88 /* 8X sampling rate select */
38+
39+
#define UART_EXAR_FCTR 0x08 /* Feature Control Register */
40+
#define UART_FCTR_EXAR_IRDA 0x10 /* IrDa data encode select */
41+
#define UART_FCTR_EXAR_485 0x20 /* Auto 485 half duplex dir ctl */
42+
#define UART_FCTR_EXAR_TRGA 0x00 /* FIFO trigger table A */
43+
#define UART_FCTR_EXAR_TRGB 0x60 /* FIFO trigger table B */
44+
#define UART_FCTR_EXAR_TRGC 0x80 /* FIFO trigger table C */
45+
#define UART_FCTR_EXAR_TRGD 0xc0 /* FIFO trigger table D programmable */
46+
47+
#define UART_EXAR_TXTRG 0x0a /* Tx FIFO trigger level write-only */
48+
#define UART_EXAR_RXTRG 0x0b /* Rx FIFO trigger level write-only */
49+
3750
#define UART_EXAR_MPIOINT_7_0 0x8f /* MPIOINT[7:0] */
3851
#define UART_EXAR_MPIOLVL_7_0 0x90 /* MPIOLVL[7:0] */
3952
#define UART_EXAR_MPIO3T_7_0 0x91 /* MPIO3T[7:0] */

drivers/tty/serial/8250/8250_port.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444

4545
#include "8250.h"
4646

47+
/*
48+
* These are definitions for the Exar XR17V35X and XR17(C|D)15X
49+
*/
50+
#define UART_EXAR_SLEEP 0x8b /* Sleep mode */
51+
#define UART_EXAR_DVID 0x8d /* Device identification */
52+
4753
/*
4854
* Debugging.
4955
*/

include/uapi/linux/serial_reg.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -366,24 +366,6 @@
366366
#define UART_OMAP_MDR1_CIR_MODE 0x06 /* CIR mode */
367367
#define UART_OMAP_MDR1_DISABLE 0x07 /* Disable (default state) */
368368

369-
/*
370-
* These are definitions for the Exar XR17V35X and XR17(C|D)15X
371-
*/
372-
#define UART_EXAR_8XMODE 0x88 /* 8X sampling rate select */
373-
#define UART_EXAR_SLEEP 0x8b /* Sleep mode */
374-
#define UART_EXAR_DVID 0x8d /* Device identification */
375-
376-
#define UART_EXAR_FCTR 0x08 /* Feature Control Register */
377-
#define UART_FCTR_EXAR_IRDA 0x10 /* IrDa data encode select */
378-
#define UART_FCTR_EXAR_485 0x20 /* Auto 485 half duplex dir ctl */
379-
#define UART_FCTR_EXAR_TRGA 0x00 /* FIFO trigger table A */
380-
#define UART_FCTR_EXAR_TRGB 0x60 /* FIFO trigger table B */
381-
#define UART_FCTR_EXAR_TRGC 0x80 /* FIFO trigger table C */
382-
#define UART_FCTR_EXAR_TRGD 0xc0 /* FIFO trigger table D programmable */
383-
384-
#define UART_EXAR_TXTRG 0x0a /* Tx FIFO trigger level write-only */
385-
#define UART_EXAR_RXTRG 0x0b /* Rx FIFO trigger level write-only */
386-
387369
/*
388370
* These are definitions for the Altera ALTR_16550_F32/F64/F128
389371
* Normalized from 0x100 to 0x40 because of shift by 2 (32 bit regs).

0 commit comments

Comments
 (0)