diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-05-09 10:03:37 (GMT) |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-05-09 10:03:37 (GMT) |
| commit | 8801561ce029ef2bf6927c53b834d711830bc8be (patch) | |
| tree | f0c730e94e96a3a1f4ae102f311f3f0fd1ec8011 /Documentation/devicetree | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
| parent | 3ca3712a42f9e632eb41da94ca4eab4f1fb06fcb (diff) | |
| download | linux-8801561ce029ef2bf6927c53b834d711830bc8be.tar.xz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/iommu/arm,smmu.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 7180745..19fe6f2 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -16,6 +16,7 @@ conditions. "arm,mmu-400" "arm,mmu-401" "arm,mmu-500" + "cavium,smmu-v2" depending on the particular implementation and/or the version of the architecture implemented. |