| Message ID | 20200505165212.76466-3-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2020-05-05 5:51 pm, Andre Przywara wrote: > Date: Mon, 4 May 2020 12:42:49 +0100 > Subject: [PATCH 02/16] dt-bindings: arm-smmu: Allow mmu-400,smmu-v1 compatible ^^ not sure how you managed that... > 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. Acked-by: Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > 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 >
On 05/05/2020 18:06, Robin Murphy wrote: > On 2020-05-05 5:51 pm, Andre Przywara wrote: >> Date: Mon, 4 May 2020 12:42:49 +0100 >> Subject: [PATCH 02/16] dt-bindings: arm-smmu: Allow mmu-400,smmu-v1 >> compatible > > ^^ not sure how you managed that... Impressive, huh? ;-) Actually just an accidental empty line when adding Cc: lines to the header (copy & paste with EOL). Using the previous subject line is probably an artefact of how git send-email works. Sorry for that! I figured that replying would create more churn, as the actual subject line is still in the email. > >> 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. > > Acked-by: Robin Murphy <robin.murphy@arm.com> Thanks! Cheers, Andre > >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> >> --- >> Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> 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 >>
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
Date: Mon, 4 May 2020 12:42:49 +0100 Subject: [PATCH 02/16] 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> --- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)