dt-bindings: arm-smmu: Fix json-schema syntax
Subsystems (3)
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.
--- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +2 -4
@@ -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
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")Reported-by Rob Herring <[email protected]>Signed-off-by Thierry Reding <[email protected]>--- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Krzysztof Kozlowski
AppliedQuoted 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]>
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
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: bf3ec9deaa33889630722c47f7bb86ba58872ea7Applied 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
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: bf3ec9deaa33889630722c47f7bb86ba58872ea7Applied 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