Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub…

…/scm/linux/kernel/git/will/linux into arm/smmu
mariux64 · Sep 25, 2014 · dedd943 · dedd943
2 parents 0f33be0 + ccd359f
commit dedd943
Show file tree

Hide file tree

Showing 2 changed files with 121 additions and 81 deletions.
diff --git 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