Pull tty/serial driver updates from Greg KH: "Here's the big tty/serial driver update for 3.19-rc1. There are a number of TTY core changes/fixes in here from Peter Hurley that have all been teted in linux-next for a long time now. There are also the normal serial driver updates as well, full details in the changelog below" * tag 'tty-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (219 commits) serial: pxa: hold port.lock when reporting modem line changes tty-hvsi_lib: Deletion of an unnecessary check before the function call "tty_kref_put" tty: Deletion of unnecessary checks before two function calls n_tty: Fix read_buf race condition, increment read_head after pushing data serial: of-serial: add PM suspend/resume support Revert "serial: of-serial: add PM suspend/resume support" Revert "serial: of-serial: fix up PM ops on no_console_suspend and port type" serial: 8250: don't attempt a trylock if in sysrq serial: core: Add big-endian iotype serial: samsung: use port->fifosize instead of hardcoded values serial: samsung: prefer to use fifosize from driver data serial: samsung: fix style problems serial: samsung: wait for transfer completion before clock disable serial: icom: fix error return code serial: tegra: clean up tty-flag assignments serial: Fix io address assign flow with Fintek PCI-to-UART Product serial: mxs-auart: fix tx_empty against shift register serial: mxs-auart: fix gpio change detection on interrupt serial: mxs-auart: Fix mxs_auart_set_ldisc() serial: 8250_dw: Use 64-bit access for OCTEON. ...
Showing the changes to include/uapi (4 of 102 files). Show all
Unified · Split
| @@ -54,7 +54,8 @@ · 53 unmodified lines | ||
| 54 | 54 | #define PORT_ALTR_16550_F32 26 /* Altera 16550 UART with 32 FIFOs */ |
| 55 | 55 | #define PORT_ALTR_16550_F64 27 /* Altera 16550 UART with 64 FIFOs */ |
| 56 | 56 | #define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */ |
| 57 | −#define PORT_MAX_8250 28 /* max port ID */ | |
| 57 | +#define PORT_RT2880 29 /* Ralink RT2880 internal UART */ | |
| 58 | +#define PORT_MAX_8250 29 /* max port ID */ | |
| 58 | 59 | |
| 59 | 60 | /* |
| 60 | 61 | * ARM specific type numbers. These are not currently guaranteed |
| @@ -359,6 +359,7 @@ · 358 unmodified lines | ||
| 359 | 359 | #define UART_OMAP_SYSC 0x15 /* System configuration register */ |
| 360 | 360 | #define UART_OMAP_SYSS 0x16 /* System status register */ |
| 361 | 361 | #define UART_OMAP_WER 0x17 /* Wake-up enable register */ |
| 362 | +#define UART_OMAP_TX_LVL 0x1a /* TX FIFO level register */ | |
| 362 | 363 | |
| 363 | 364 | /* |
| 364 | 365 | * These are the definitions for the MDR1 register |
| @@ -6,27 +6,31 @@ · 5 unmodified lines | ||
| 6 | 6 | * shared by the tty_port flags structures. |
| 7 | 7 | * |
| 8 | 8 | * Define ASYNCB_* for convenient use with {test,set,clear}_bit. |
| 9 | + * | |
| 10 | + * Bits [0..ASYNCB_LAST_USER] are userspace defined/visible/changeable | |
| 11 | + * [x] in the bit comments indicates the flag is defunct and no longer used. | |
| 9 | 12 | */ |
| 10 | 13 | #define ASYNCB_HUP_NOTIFY 0 /* Notify getty on hangups and closes |
| 11 | 14 | * on the callout port */ |
| 12 | 15 | #define ASYNCB_FOURPORT 1 /* Set OU1, OUT2 per AST Fourport settings */ |
| 13 | 16 | #define ASYNCB_SAK 2 /* Secure Attention Key (Orange book) */ |
| 14 | −#define ASYNCB_SPLIT_TERMIOS 3 /* Separate termios for dialin/callout */ | |
| 17 | +#define ASYNCB_SPLIT_TERMIOS 3 /* [x] Separate termios for dialin/callout */ | |
| 15 | 18 | #define ASYNCB_SPD_HI 4 /* Use 56000 instead of 38400 bps */ |
| 16 | 19 | #define ASYNCB_SPD_VHI 5 /* Use 115200 instead of 38400 bps */ |
| 17 | 20 | #define ASYNCB_SKIP_TEST 6 /* Skip UART test during autoconfiguration */ |
| 18 | 21 | #define ASYNCB_AUTO_IRQ 7 /* Do automatic IRQ during |
| 19 | 22 | * autoconfiguration */ |
| 20 | −#define ASYNCB_SESSION_LOCKOUT 8 /* Lock out cua opens based on session */ | |
| 21 | −#define ASYNCB_PGRP_LOCKOUT 9 /* Lock out cua opens based on pgrp */ | |
| 22 | −#define ASYNCB_CALLOUT_NOHUP 10 /* Don't do hangups for cua device */ | |
| 23 | +#define ASYNCB_SESSION_LOCKOUT 8 /* [x] Lock out cua opens based on session */ | |
| 24 | +#define ASYNCB_PGRP_LOCKOUT 9 /* [x] Lock out cua opens based on pgrp */ | |
| 25 | +#define ASYNCB_CALLOUT_NOHUP 10 /* [x] Don't do hangups for cua device */ | |
| 23 | 26 | #define ASYNCB_HARDPPS_CD 11 /* Call hardpps when CD goes high */ |
| 24 | 27 | #define ASYNCB_SPD_SHI 12 /* Use 230400 instead of 38400 bps */ |
| 25 | 28 | #define ASYNCB_LOW_LATENCY 13 /* Request low latency behaviour */ |
| 26 | 29 | #define ASYNCB_BUGGY_UART 14 /* This is a buggy UART, skip some safety |
| 27 | 30 | * checks. Note: can be dangerous! */ |
| 28 | −#define ASYNCB_AUTOPROBE 15 /* Port was autoprobed by PCI or PNP code */ | |
| 29 | −#define ASYNCB_LAST_USER 15 | |
| 31 | +#define ASYNCB_AUTOPROBE 15 /* [x] Port was autoprobed by PCI/PNP code */ | |
| 32 | +#define ASYNCB_MAGIC_MULTIPLIER 16 /* Use special CLK or divisor */ | |
| 33 | +#define ASYNCB_LAST_USER 16 | |
| 30 | 34 | |
| 31 | 35 | /* Internal flags used only by kernel */ |
| 32 | 36 | #define ASYNCB_INITIALIZED 31 /* Serial port was initialized */ |
| @@ -57,8 +61,11 @@ · 24 unmodified lines | ||
| 57 | 61 | #define ASYNC_LOW_LATENCY (1U << ASYNCB_LOW_LATENCY) |
| 58 | 62 | #define ASYNC_BUGGY_UART (1U << ASYNCB_BUGGY_UART) |
| 59 | 63 | #define ASYNC_AUTOPROBE (1U << ASYNCB_AUTOPROBE) |
| 64 | +#define ASYNC_MAGIC_MULTIPLIER (1U << ASYNCB_MAGIC_MULTIPLIER) | |
| 60 | 65 | |
| 61 | 66 | #define ASYNC_FLAGS ((1U << (ASYNCB_LAST_USER + 1)) - 1) |
| 67 | +#define ASYNC_DEPRECATED (ASYNC_SESSION_LOCKOUT | ASYNC_PGRP_LOCKOUT | \ | |
| 68 | + ASYNC_CALLOUT_NOHUP | ASYNC_AUTOPROBE) | |
| 62 | 69 | #define ASYNC_USR_MASK (ASYNC_SPD_MASK|ASYNC_CALLOUT_NOHUP| \ |
| 63 | 70 | ASYNC_LOW_LATENCY) |
| 64 | 71 | #define ASYNC_SPD_CUST (ASYNC_SPD_HI|ASYNC_SPD_VHI) |
| @@ -84,7 +84,4 @@ struct vt_setactivate { · 83 unmodified lines | ||
| 84 | 84 | |
| 85 | 85 | #define VT_SETACTIVATE 0x560F /* Activate and set the mode of a console */ |
| 86 | 86 | |
| 87 | − | |
| 88 | −#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1) | |
| 89 | − | |
| 90 | 87 | #endif /* _UAPI_LINUX_VT_H */ |