Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ccbab56..cc4ab25 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.
 
+               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]
@@ -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.
 
+               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]
@@ -3524,6 +3542,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        READ_DISC_INFO command);
                                e = NO_READ_CAPACITY_16 (don't use
                                        READ_CAPACITY_16 command);
+                               f = NO_REPORT_OPCODES (don't use report opcodes
+                                       command, uas only);
                                h = CAPACITY_HEURISTICS (decrease the
                                        reported device capacity by one
                                        sector if the number is odd);
@@ -3543,6 +3563,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        bogus residue values);
                                s = SINGLE_LUN (the device has only one
                                        Logical Unit);
+                               t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
+                                       commands, uas only);
                                u = IGNORE_UAS (don't bind to the uas driver);
                                w = NO_WP_DETECT (don't test whether the
                                        medium is write-protected).