summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2014-09-25 15:34:23 +0200
committerJoerg Roedel <jroedel@suse.de>2014-09-25 15:34:23 +0200
commitdedd9431484a826f85667967ef0c5954b12c3537 (patch)
treea8be2d419ace3eaab153185f9fab1952f3875db7 /Documentation
parent0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff)
parentccd359f219bee914501a8892b148e2a1315066d3 (diff)
downloadlinux-dedd9431484a826f85667967ef0c5954b12c3537.tar.gz
linux-dedd9431484a826f85667967ef0c5954b12c3537.tar.bz2
linux-dedd9431484a826f85667967ef0c5954b12c3537.zip
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.txt1
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.
"arm,smmu-v1"
"arm,smmu-v2"
"arm,mmu-400"
+ "arm,mmu-401"
"arm,mmu-500"
depending on the particular implementation and/or the