diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-09-25 15:34:23 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-09-25 15:34:23 +0200 |
| commit | dedd9431484a826f85667967ef0c5954b12c3537 (patch) | |
| tree | a8be2d419ace3eaab153185f9fab1952f3875db7 /Documentation/devicetree | |
| parent | Linux 3.17-rc6 (diff) | |
| parent | iommu/arm-smmu: fix bug in pmd construction (diff) | |
| download | linux-dedd9431484a826f85667967ef0c5954b12c3537.tar.xz 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/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 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 |