Skip to content

Commit bf3ec9d

Browse files
thierryredingkrzk
authored andcommitted
dt-bindings: arm-smmu: Fix json-schema syntax
Commit 4287861 ("dt-bindings: arm-smmu: Add Tegra186 compatible string") introduced a jsonschema syntax error as a result of a rebase gone wrong. Fix it. Fixes: 4287861 ("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>
1 parent 47661ee commit bf3ec9d

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,14 @@ properties:
5252
items:
5353
- const: marvell,ap806-smmu-500
5454
- const: arm,mmu-500
55-
- description: NVIDIA SoCs that program two ARM MMU-500s identically
56-
items:
5755
- description: NVIDIA SoCs that require memory controller interaction
5856
and may program multiple ARM MMU-500s identically with the memory
5957
controller interleaving translations between multiple instances
6058
for improved performance.
6159
items:
6260
- enum:
63-
- const: nvidia,tegra194-smmu
64-
- const: nvidia,tegra186-smmu
61+
- nvidia,tegra194-smmu
62+
- nvidia,tegra186-smmu
6563
- const: nvidia,smmu-500
6664
- items:
6765
- const: arm,mmu-500

0 commit comments

Comments
 (0)