diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 12:01:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 12:01:02 -0400 |
commit | 49eb7b0750d9483c74e9c14ae6ea1e9d62481c3c (patch) | |
tree | 68f76b18328d070a4b5182f9ed82c2134cae16d2 /Documentation/kernel-parameters.txt | |
parent | 5142c33ed86acbcef5c63a63d2b7384b9210d39f (diff) | |
parent | 9ce4f8f3f45443922c98e25133b8c9790fc7949a (diff) |
Merge tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into next
Pull tty/serial driver updates from Greg KH:
"Here is the big tty / serial driver pull request for 3.16-rc1.
A variety of different serial driver fixes and updates and additions,
nothing huge, and no real major core tty changes at all.
All have been in linux-next for a while"
* tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (84 commits)
Revert "serial: imx: remove the DMA wait queue"
serial: kgdb_nmi: Improve console integration with KDB I/O
serial: kgdb_nmi: Switch from tasklets to real timers
serial: kgdb_nmi: Use container_of() to locate private data
serial: cpm_uart: No LF conversion in put_poll_char()
serial: sirf: Fix compilation failure
console: Remove superfluous readonly check
console: Use explicit pointer type for vc_uni_pagedir* fields
vgacon: Fix & cleanup refcounting
ARM: tty: Move HVC DCC assembly to arch/arm
tty/hvc/hvc_console: Fix wakeup of HVC thread on hvc_kick()
drivers/tty/n_hdlc.c: replace kmalloc/memset by kzalloc
vt: emulate 8- and 24-bit colour codes.
printk/of_serial: fix serial console cessation part way through boot.
serial: 8250_dma: check the result of TX buffer mapping
serial: uart: add hw flow control support configuration
tty/serial: at91: add interrupts for modem control lines
tty/serial: at91: use mctrl_gpio helpers
tty/serial: Add GPIOLIB helpers for controlling modem lines
ARM: at91: gpio: implement get_direction
...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 7da289ee0589..4ddcbf949699 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -883,6 +883,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
883 | which are not unmapped. | 883 | which are not unmapped. |
884 | 884 | ||
885 | earlycon= [KNL] Output early console device and options. | 885 | earlycon= [KNL] Output early console device and options. |
886 | |||
886 | uart[8250],io,<addr>[,options] | 887 | uart[8250],io,<addr>[,options] |
887 | uart[8250],mmio,<addr>[,options] | 888 | uart[8250],mmio,<addr>[,options] |
888 | uart[8250],mmio32,<addr>[,options] | 889 | uart[8250],mmio32,<addr>[,options] |
@@ -892,6 +893,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
892 | (mmio) or 32-bit (mmio32). | 893 | (mmio) or 32-bit (mmio32). |
893 | The options are the same as for ttyS, above. | 894 | The options are the same as for ttyS, above. |
894 | 895 | ||
896 | pl011,<addr> | ||
897 | Start an early, polled-mode console on a pl011 serial | ||
898 | port at the specified address. The pl011 serial port | ||
899 | must already be setup and configured. Options are not | ||
900 | yet supported. | ||
901 | |||
902 | smh Use ARM semihosting calls for early console. | ||
903 | |||
895 | earlyprintk= [X86,SH,BLACKFIN,ARM,M68k] | 904 | earlyprintk= [X86,SH,BLACKFIN,ARM,M68k] |
896 | earlyprintk=vga | 905 | earlyprintk=vga |
897 | earlyprintk=efi | 906 | earlyprintk=efi |