public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Fixes: 4287861dca ("dt-bindings: arm-smmu: Add Tegra186 compatible string")
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210621140036.2879563-1-thierry.reding@gmail.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
This commit is contained in:
Thierry Reding 2021-06-21 16:00:36 +02:00 • committed by Krzysztof Kozlowski
parent 47661ee182
commit bf3ec9deaa
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/devicetree/bindings/iommu/arm,smmu.yaml
View file

@ -52,16 +52,14 @@ properties:
items: items:
- const: marvell,ap806-smmu-500 - const: marvell,ap806-smmu-500
- const: arm,mmu-500 - const: arm,mmu-500
- description: NVIDIA SoCs that program two ARM MMU-500s identically
items:
- description: NVIDIA SoCs that require memory controller interaction - description: NVIDIA SoCs that require memory controller interaction
and may program multiple ARM MMU-500s identically with the memory and may program multiple ARM MMU-500s identically with the memory
controller interleaving translations between multiple instances controller interleaving translations between multiple instances
for improved performance. for improved performance.
items: items:
- enum: - enum:
- const: nvidia,tegra194-smmu - nvidia,tegra194-smmu
- const: nvidia,tegra186-smmu - nvidia,tegra186-smmu
- const: nvidia,smmu-500 - const: nvidia,smmu-500
- items: - items:
- const: arm,mmu-500 - const: arm,mmu-500