aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/xilinx_uartps.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 06:52:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 06:52:11 -0400
commit683a52a10148e929fb4844f9237f059a47c0b01b (patch)
treea64af13ef46a08ff12d1974725cd70d768750fb6 /drivers/tty/serial/xilinx_uartps.c
parentb9af5643fdc5365a23f9752a1181fef374425217 (diff)
parent69784fa539efa477f39b5a849c27d5e630e0db27 (diff)
Merge tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here's the big tty/serial driver patchset for 3.18-rc1. Lots of little things in here, some good work from Peter Hurley on the tty core, and in lots of drivers. There are also lots of other driver updates in here as well, full details in the changelogs. All have been in the linux-next tree for a while" * tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (99 commits) Revert "serial/core: Initialize the console pm state" tty: serial: 8250: use 32bit variable for rpm_tx_active tty: serial: msm: Add earlycon support serial/core: Initialize the console pm state serial: asc: Conditionally use readl_relaxed (COMPILE_TEST) serial: of-serial: add PM suspend/resume support m68k: AMIGA_BUILTIN_SERIAL should depend on TTY asm/uapi: Add definition of TIOC[SG]RS485 tty/metag_da: Add console_poll module parameter serial: 8250_pci: remove rts_n override from Baytrail quirk serial: cadence: Add generic earlycon support serial: imx: change the wait even to interruptiable serial: imx: terminate the RX DMA when the UART is suspending serial: imx: fix throttle/unthrottle callbacks for hardware assisted flow control serial: 8250: Add Quark X1000 to 8250_pci.c tty: omap-serial: pull out calculation from baud_is_mode16 tty: omap-serial: fix division by zero xen_hvc: no reason to write the type key on xenstore tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx() tty: serial: 8250_core: use the ->line argument as a hint in serial8250_find_match_or_unused() ...
Diffstat (limited to 'drivers/tty/serial/xilinx_uartps.c')
-rw-r--r--drivers/tty/serial/xilinx_uartps.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 806e4bcadbd7..200c1af2141b 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1051,6 +1051,25 @@ static void cdns_uart_console_putchar(struct uart_port *port, int ch)
1051 cdns_uart_writel(ch, CDNS_UART_FIFO_OFFSET); 1051 cdns_uart_writel(ch, CDNS_UART_FIFO_OFFSET);
1052} 1052}
1053 1053
1054static void cdns_early_write(struct console *con, const char *s, unsigned n)
1055{
1056 struct earlycon_device *dev = con->data;
1057
1058 uart_console_write(&dev->port, s, n, cdns_uart_console_putchar);
1059}
1060
1061static int __init cdns_early_console_setup(struct earlycon_device *device,
1062 const char *opt)
1063{
1064 if (!device->port.membase)
1065 return -ENODEV;
1066
1067 device->con->write = cdns_early_write;
1068
1069 return 0;
1070}
1071EARLYCON_DECLARE(cdns, cdns_early_console_setup);
1072
1054/** 1073/**
1055 * cdns_uart_console_write - perform write operation 1074 * cdns_uart_console_write - perform write operation
1056 * @co: Console handle 1075 * @co: Console handle
@@ -1428,7 +1447,6 @@ static struct platform_driver cdns_uart_platform_driver = {
1428 .probe = cdns_uart_probe, 1447 .probe = cdns_uart_probe,
1429 .remove = cdns_uart_remove, 1448 .remove = cdns_uart_remove,
1430 .driver = { 1449 .driver = {
1431 .owner = THIS_MODULE,
1432 .name = CDNS_UART_NAME, 1450 .name = CDNS_UART_NAME,
1433 .of_match_table = cdns_uart_of_match, 1451 .of_match_table = cdns_uart_of_match,
1434 .pm = &cdns_uart_dev_pm_ops, 1452 .pm = &cdns_uart_dev_pm_ops,