diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-09-25 09:34:23 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-09-25 09:34:23 -0400 |
| commit | dedd9431484a826f85667967ef0c5954b12c3537 (patch) | |
| tree | a8be2d419ace3eaab153185f9fab1952f3875db7 /Documentation | |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff) | |
| parent | ccd359f219bee914501a8892b148e2a1315066d3 (diff) | |
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')
| -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 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 |