aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/serial_core.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-05 19:55:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-05 19:55:56 -0400
commita22e48cf317d22a4326dc19e906e6b5f4f92e94e (patch)
treee3573ec1f96c50e52efe8717d9a99f249c4a65cf /include/linux/serial_core.h
parentec064d3c6b40697fd72f4b1eeabbf293b7947a04 (diff)
parent4b4ecd9cb853c14913a3726cfcc60ccda1d2924a (diff)
Merge tag 'tty-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH: "Here is the big tty/serial driver update for 4.18-rc1. There's nothing major here, just lots of serial driver updates. Full details are in the shortlog, nothing anything specific to call out here. All have been in linux-next for a while with no reported issues" * tag 'tty-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (55 commits) vt: Perform safe console erase only once serial: imx: disable UCR4_OREN on shutdown serial: imx: drop CTS/RTS handling from shutdown tty: fix typo in ASYNCB_FOURPORT comment serial: samsung: check DMA engine capabilities before using DMA mode tty: Fix data race in tty_insert_flip_string_fixed_flag tty: serial: msm_geni_serial: Fix TX infinite loop serial: 8250_dw: Fix runtime PM handling serial: 8250: omap: Fix idling of clocks for unused uarts tty: serial: drop ATH79 specific SoC symbols serial: 8250: Add missing rxtrig_bytes on Altera 16550 UART serial/aspeed-vuart: fix a couple mod_timer() calls serial: sh-sci: Use spin_{try}lock_irqsave instead of open coding version serial: 8250_of: Add IO space support tty/serial: atmel: use port->name as name in request_irq() serial: imx: dma_unmap_sg buffers on shutdown serial: imx: cleanup imx_uart_disable_dma() tty: serial: qcom_geni_serial: Add early console support tty: serial: qcom_geni_serial: Return IRQ_NONE for spurious interrupts tty: serial: qcom_geni_serial: Use iowrite32_rep to write to FIFO ...
Diffstat (limited to 'include/linux/serial_core.h')
-rw-r--r--include/linux/serial_core.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index b4c9fda9d833..06ea4eeb09ab 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -233,6 +233,7 @@ struct uart_port {
233#define UPSTAT_AUTORTS ((__force upstat_t) (1 << 2)) 233#define UPSTAT_AUTORTS ((__force upstat_t) (1 << 2))
234#define UPSTAT_AUTOCTS ((__force upstat_t) (1 << 3)) 234#define UPSTAT_AUTOCTS ((__force upstat_t) (1 << 3))
235#define UPSTAT_AUTOXOFF ((__force upstat_t) (1 << 4)) 235#define UPSTAT_AUTOXOFF ((__force upstat_t) (1 << 4))
236#define UPSTAT_SYNC_FIFO ((__force upstat_t) (1 << 5))
236 237
237 int hw_stopped; /* sw-assisted CTS flow state */ 238 int hw_stopped; /* sw-assisted CTS flow state */
238 unsigned int mctrl; /* current modem ctrl settings */ 239 unsigned int mctrl; /* current modem ctrl settings */
@@ -348,7 +349,8 @@ struct earlycon_device {
348}; 349};
349 350
350struct earlycon_id { 351struct earlycon_id {
351 char name[16]; 352 char name[15];
353 char name_term; /* In case compiler didn't '\0' term name */
352 char compatible[128]; 354 char compatible[128];
353 int (*setup)(struct earlycon_device *, const char *options); 355 int (*setup)(struct earlycon_device *, const char *options);
354}; 356};