From: Andre Przywara <andre.przywara@arm.com>
Date: Thu, 7 May 2020 11:24:14 +0000 (+0100)
Subject: dt-bindings: arm-smmu: Allow mmu-400, smmu-v1 compatible
X-Git-Tag: v5.8-rc1~91^2~1^4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd0d696023cb381608e9c3d59dddb25b3816eee7;p=thirdparty%2Flinux.git

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>
---

diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
index 6515dbe47508c..e3ef1c69d1326 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