Skip to contentSkip to conversation

dt-bindings: arm-smmu: Fix json-schema syntax

PATCH Applied Thierry Reding 4 participants 6 messages Jun 21, 2021 – Jul 20, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dt-bindings: arm-smmu: Fix json-schema syntax

From: Thierry Reding <[email protected]>

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Fixes 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string")
---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +2 -4
index 1181b590db71..03f2b2d4db30 100644
@@ -52,16 +52,14 @@ properties:
         items:
           - const: marvell,ap806-smmu-500
           - const: arm,mmu-500
-      - description: NVIDIA SoCs that program two ARM MMU-500s identically
-        items:
       - description: NVIDIA SoCs that require memory controller interaction
           and may program multiple ARM MMU-500s identically with the memory
           controller interleaving translations between multiple instances
           for improved performance.
         items:
           - enum:
-              - const: nvidia,tegra194-smmu
-              - const: nvidia,tegra186-smmu
+              - nvidia,tegra194-smmu
+              - nvidia,tegra186-smmu
           - const: nvidia,smmu-500
       - items:
           - const: arm,mmu-500
Signature · 1 line
2.32.0
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Quoted 6 lines
Fixes 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string")
---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
#2 lore raw
In reply to Thierry Reding
Quoted 3 lines · Thierry Reding

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Applied, thanks!

[1/1] dt-bindings: arm-smmu: Fix json-schema syntax

      commit: bf3ec9deaa33889630722c47f7bb86ba58872ea7

Best regards,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>
#3 lore raw
Quoted 10 lines · Krzysztof Kozlowski
Quoted 3 lines · Thierry Reding

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Applied, thanks!

[1/1] dt-bindings: arm-smmu: Fix json-schema syntax

      commit: bf3ec9deaa33889630722c47f7bb86ba58872ea7

Applied where? Now Linus's master is broken.

Rob

#4 lore raw
Quoted 9 lines · Rob Herring
Quoted 6 lines · Krzysztof Kozlowski
Quoted 3 lines · Thierry Reding

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Quoted 6 lines
Quoted 4 lines

Applied, thanks!

[1/1] dt-bindings: arm-smmu: Fix json-schema syntax

      commit: bf3ec9deaa33889630722c47f7bb86ba58872ea7

Applied where? Now Linus's master is broken.

To memory controller drivers tree. Pushed to soc folks some time ago:
https://lore.kernel.org/lkml/[email protected]/

Cc: Arnd and Olof,
Any comments on merging these fixes? They should go to current RC.

Best regards,
Krzysztof

#5 lore raw
Quoted 13 lines · Krzysztof Kozlowski
Quoted 11 lines · Rob Herring
Quoted 8 lines · Krzysztof Kozlowski
Quoted 3 lines · Thierry Reding

Commit 4287861dca9d ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it.

Applied, thanks!

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

[1/1] dt-bindings: arm-smmu: Fix json-schema syntax

      commit: bf3ec9deaa33889630722c47f7bb86ba58872ea7

Applied where? Now Linus's master is broken.

To memory controller drivers tree. Pushed to soc folks some time ago:
https://lore.kernel.org/lkml/[email protected]/

Hi Rob,

The patch landed in the Linus' tree in v5.14-rc2.

Best regards,
Krzysztof
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu