Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 512a35929f946a111391a8e638ae0a2e4f03d290..bfcb1a62a7b48466f3cbe5a08d3e1a632eadc3d2 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -970,6 +970,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                smh     Use ARM semihosting calls for early console.
 
+               s3c2410,<addr>
+               s3c2412,<addr>
+               s3c2440,<addr>
+               s3c6400,<addr>
+               s5pv210,<addr>
+               exynos4210,<addr>
+                       Use early console provided by serial driver available
+                       on Samsung SoCs, requires selecting proper type and
+                       a correct base address of the selected UART port. The
+                       serial port must already be setup and configured.
+                       Options are not yet supported.
+
        earlyprintk=    [X86,SH,BLACKFIN,ARM,M68k]
                        earlyprintk=vga
                        earlyprintk=efi
@@ -1497,6 +1509,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                forcesac
                soft
                pt              [x86, IA-64]
+               nobypass        [PPC/POWERNV]
+                       Disable IOMMU bypass, using IOMMU for PCI devices.
 
 
        io7=            [HW] IO7 for Marvel based alpha systems