aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 18:53:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-26 18:53:22 -0400
commit8c7febe83915332276cab49e89f6580bb963fb9a (patch)
treec6ffa5fbdef402f8c6e2d75b19dcce813fd21ded /Documentation/kernel-parameters.txt
parent23908db413eccd77084b09c9b0a4451dfb0524c0 (diff)
parent71206b9f8120eb513c621d4f31906577bb658df3 (diff)
Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here's the tty and serial driver patches for 4.2-rc1. A number of individual driver updates, some code cleanups, and other minor things, full details in the shortlog. All have been in linux-next for a while with no reported issues" * tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (152 commits) Doc: serial-rs485.txt: update RS485 driver interface Doc: tty.txt: remove mention of the BKL MAINTAINERS: tty: add serial docs directory serial: sprd: check for NULL after calling devm_clk_get serial: 8250_pci: Correct uartclk for xr17v35x expansion chips serial: 8250_pci: Add support for 12 port Exar boards serial: 8250_uniphier: add bindings document for UniPhier UART serial: core: cleanup in uart_get_baud_rate() serial: stm32-usart: Add STM32 USART Driver tty/serial: kill off set_irq_flags usage tty: move linux/gsmmux.h to uapi doc: dt: add documentation for nxp,lpc1850-uart serial: 8250: add LPC18xx/43xx UART driver serial: 8250_uniphier: add UniPhier serial driver serial: 8250_dw: support ACPI platforms with integrated DMA engine serial: of_serial: check the return value of clk_prepare_enable() serial: of_serial: use devm_clk_get() instead of clk_get() serial: earlycon: Add support for big-endian MMIO accesses serial: sirf: use hrtimer for data rx serial: sirf: correct the fifo empty_bit ...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1e18efe3a4ed..8bb54c95cece 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -972,14 +972,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
972 uart[8250],io,<addr>[,options] 972 uart[8250],io,<addr>[,options]
973 uart[8250],mmio,<addr>[,options] 973 uart[8250],mmio,<addr>[,options]
974 uart[8250],mmio32,<addr>[,options] 974 uart[8250],mmio32,<addr>[,options]
975 uart[8250],mmio32be,<addr>[,options]
975 uart[8250],0x<addr>[,options] 976 uart[8250],0x<addr>[,options]
976 Start an early, polled-mode console on the 8250/16550 977 Start an early, polled-mode console on the 8250/16550
977 UART at the specified I/O port or MMIO address. 978 UART at the specified I/O port or MMIO address.
978 MMIO inter-register address stride is either 8-bit 979 MMIO inter-register address stride is either 8-bit
979 (mmio) or 32-bit (mmio32). 980 (mmio) or 32-bit (mmio32 or mmio32be).
980 If none of [io|mmio|mmio32], <addr> is assumed to be 981 If none of [io|mmio|mmio32|mmio32be], <addr> is assumed
981 equivalent to 'mmio'. 'options' are specified in the 982 to be equivalent to 'mmio'. 'options' are specified
982 same format described for "console=ttyS<n>"; if 983 in the same format described for "console=ttyS<n>"; if
983 unspecified, the h/w is not initialized. 984 unspecified, the h/w is not initialized.
984 985
985 pl011,<addr> 986 pl011,<addr>