diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt | 14 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt b/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt new file mode 100644 index 000000000000..099d9362ebc1 --- /dev/null +++ b/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt | |||
@@ -0,0 +1,14 @@ | |||
1 | NVIDIA Tegra 20 GART | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: "nvidia,tegra20-gart" | ||
5 | - reg: Two pairs of cells specifying the physical address and size of | ||
6 | the memory controller registers and the GART aperture respectively. | ||
7 | |||
8 | Example: | ||
9 | |||
10 | gart { | ||
11 | compatible = "nvidia,tegra20-gart"; | ||
12 | reg = <0x7000f024 0x00000018 /* controller registers */ | ||
13 | 0x58000000 0x02000000>; /* GART aperture */ | ||
14 | }; | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c1601e5a8b71..b86f09e7efd4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -335,6 +335,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
335 | requirements as needed. This option | 335 | requirements as needed. This option |
336 | does not override iommu=pt | 336 | does not override iommu=pt |
337 | 337 | ||
338 | amd_iommu_dump= [HW,X86-64] | ||
339 | Enable AMD IOMMU driver option to dump the ACPI table | ||
340 | for AMD IOMMU. With this option enabled, AMD IOMMU | ||
341 | driver will print ACPI tables for AMD IOMMU during | ||
342 | IOMMU initialization. | ||
343 | |||
338 | amijoy.map= [HW,JOY] Amiga joystick support | 344 | amijoy.map= [HW,JOY] Amiga joystick support |
339 | Map of devices attached to JOY0DAT and JOY1DAT | 345 | Map of devices attached to JOY0DAT and JOY1DAT |
340 | Format: <a>,<b> | 346 | Format: <a>,<b> |