Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1edd5fdc629d29d4b9ddbf650a86f285a457f71b..d9a452e8fb9b3bb1f34d89ddaa87cb8dd90b04bd 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -921,6 +921,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        earlycon=       [KNL] Output early console device and options.
 
 
        earlycon=       [KNL] Output early console device and options.
 

+               cdns,<addr>
+                       Start an early, polled-mode console on a cadence serial
+                       port at the specified address. The cadence serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+

                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
                uart[8250],mmio32,<addr>[,options]
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
                uart[8250],mmio32,<addr>[,options]


@@ -936,6 +942,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        must already be setup and configured. Options are not
                        yet supported.
 
                        must already be setup and configured. Options are not
                        yet supported.
 

+               msm_serial,<addr>
+                       Start an early, polled-mode console on an msm serial
+                       port at the specified address. The serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+
+               msm_serial_dm,<addr>
+                       Start an early, polled-mode console on an msm serial
+                       dm port at the specified address. The serial port
+                       must already be setup and configured. Options are not
+                       yet supported.
+

                smh     Use ARM semihosting calls for early console.
 
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                smh     Use ARM semihosting calls for early console.
 
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]