summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/iommu
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2020-05-07 12:24:14 +0100
committerWill Deacon <will@kernel.org>2020-05-07 14:24:37 +0100
commitbd0d696023cb381608e9c3d59dddb25b3816eee7 (patch)
tree1dd46f235c723043bb3e36fffcc96169d6bbb738 /Documentation/devicetree/bindings/iommu
parent68aee4af5f62030869021d81c5d59ebd99528d4b (diff)
downloadlinux-bd0d696023cb381608e9c3d59dddb25b3816eee7.tar.bz2
dt-bindings: arm-smmu: Allow mmu-400, smmu-v1 compatible
The Arm SMMUv1 DT binding only allows combining arm,mmu-401 with arm,smmu-v1, even though the MMU-400 is compatible as well. Allow this combination as well to let the Arm Juno board pass the test. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Robin Murphy <robin.murphy@arm.com> Link: https://lore.kernel.org/r/20200507112430.183940-2-andre.przywara@arm.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/iommu')
-rw-r--r--Documentation/devicetree/bindings/iommu/arm,smmu.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
index 6515dbe47508..e3ef1c69d132 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@ -41,7 +41,9 @@ properties:
- const: arm,mmu-500
- const: arm,smmu-v2
- items:
- - const: arm,mmu-401
+ - enum:
+ - arm,mmu-400
+ - arm,mmu-401
- const: arm,smmu-v1
- enum:
- arm,smmu-v1