diff options
author | Robin Murphy <Robin.Murphy@arm.com> | 2014-08-28 12:52:00 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-09-16 14:15:23 -0400 |
commit | d3aba0460a2e13b49892f7a12237f82658c44257 (patch) | |
tree | 3a648fd738c37423b00e3668ab53bff008c1fc39 | |
parent | 093604033361928f7f355b4d1766d0179ae747fb (diff) |
iommu/arm-smmu: support MMU-401
MMU-401 is similar to MMU-400, but updated with limited ARMv8 support.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.txt | 1 | ||||
-rw-r--r-- | drivers/iommu/arm-smmu.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 2d0f7cd867ea..06760503a819 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt | |||
@@ -14,6 +14,7 @@ conditions. | |||
14 | "arm,smmu-v1" | 14 | "arm,smmu-v1" |
15 | "arm,smmu-v2" | 15 | "arm,smmu-v2" |
16 | "arm,mmu-400" | 16 | "arm,mmu-400" |
17 | "arm,mmu-401" | ||
17 | "arm,mmu-500" | 18 | "arm,mmu-500" |
18 | 19 | ||
19 | depending on the particular implementation and/or the | 20 | depending on the particular implementation and/or the |
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index c00f483e106f..939242c41100 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c | |||
@@ -1889,6 +1889,7 @@ static struct of_device_id arm_smmu_of_match[] = { | |||
1889 | { .compatible = "arm,smmu-v1", .data = (void *)ARM_SMMU_V1 }, | 1889 | { .compatible = "arm,smmu-v1", .data = (void *)ARM_SMMU_V1 }, |
1890 | { .compatible = "arm,smmu-v2", .data = (void *)ARM_SMMU_V2 }, | 1890 | { .compatible = "arm,smmu-v2", .data = (void *)ARM_SMMU_V2 }, |
1891 | { .compatible = "arm,mmu-400", .data = (void *)ARM_SMMU_V1 }, | 1891 | { .compatible = "arm,mmu-400", .data = (void *)ARM_SMMU_V1 }, |
1892 | { .compatible = "arm,mmu-401", .data = (void *)ARM_SMMU_V1 }, | ||
1892 | { .compatible = "arm,mmu-500", .data = (void *)ARM_SMMU_V2 }, | 1893 | { .compatible = "arm,mmu-500", .data = (void *)ARM_SMMU_V2 }, |
1893 | { }, | 1894 | { }, |
1894 | }; | 1895 | }; |