diff options
-rw-r--r-- | Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt | 6 | ||||
-rw-r--r-- | drivers/iommu/tegra-gart.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt b/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt index 2d87b9191fc..099d9362ebc 100644 --- a/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt +++ b/Documentation/devicetree/bindings/iommu/nvidia,tegra20-gart.txt | |||
@@ -7,8 +7,8 @@ Required properties: | |||
7 | 7 | ||
8 | Example: | 8 | Example: |
9 | 9 | ||
10 | gart: gart@7000f000 { | 10 | gart { |
11 | compatible = "nvidia,tegra20-gart"; | 11 | compatible = "nvidia,tegra20-gart"; |
12 | reg = < 0x7000f000 0x00000100 /* controller registers */ | 12 | reg = <0x7000f024 0x00000018 /* controller registers */ |
13 | 0x58000000 0x02000000 >; /* GART aperture */ | 13 | 0x58000000 0x02000000>; /* GART aperture */ |
14 | }; | 14 | }; |
diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c index 40533bba625..0c0a3779221 100644 --- a/drivers/iommu/tegra-gart.c +++ b/drivers/iommu/tegra-gart.c | |||
@@ -36,9 +36,10 @@ | |||
36 | /* bitmap of the page sizes currently supported */ | 36 | /* bitmap of the page sizes currently supported */ |
37 | #define GART_IOMMU_PGSIZES (SZ_4K) | 37 | #define GART_IOMMU_PGSIZES (SZ_4K) |
38 | 38 | ||
39 | #define GART_CONFIG 0x24 | 39 | #define GART_REG_BASE 0x24 |
40 | #define GART_ENTRY_ADDR 0x28 | 40 | #define GART_CONFIG (0x24 - GART_REG_BASE) |
41 | #define GART_ENTRY_DATA 0x2c | 41 | #define GART_ENTRY_ADDR (0x28 - GART_REG_BASE) |
42 | #define GART_ENTRY_DATA (0x2c - GART_REG_BASE) | ||
42 | #define GART_ENTRY_PHYS_ADDR_VALID (1 << 31) | 43 | #define GART_ENTRY_PHYS_ADDR_VALID (1 << 31) |
43 | 44 | ||
44 | #define GART_PAGE_SHIFT 12 | 45 | #define GART_PAGE_SHIFT 12 |