diff mbox series

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

Message ID 20210621140036.2879563-1-thierry.reding@gmail.com
State New
Headers show
Series dt-bindings: arm-smmu: Fix json-schema syntax | expand

Commit Message

Thierry Reding June 21, 2021, 2 p.m. UTC 
From: Thierry Reding <treding@nvidia.com>

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")
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Rob Herring June 22, 2021, 4:24 p.m. UTC | #1 
On Mon, Jun 21, 2021 at 7:58 AM Thierry Reding <thierry.reding@gmail.com> wrote:
>

> From: Thierry Reding <treding@nvidia.com>

>

> 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")

> Reported-by: Rob Herring <robh@kernel.org>

> Signed-off-by: Thierry Reding <treding@nvidia.com>

> ---

>  Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++----

>  1 file changed, 2 insertions(+), 4 deletions(-)


Acked-by: Rob Herring <robh@kernel.org>
Krzysztof Kozlowski June 23, 2021, 5:56 a.m. UTC | #2 
On Mon, 21 Jun 2021 16:00:36 +0200, Thierry Reding wrote:
> 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,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Rob Herring July 12, 2021, 2:14 p.m. UTC | #3 
On Tue, Jun 22, 2021 at 11:56 PM Krzysztof Kozlowski
<krzysztof.kozlowski@canonical.com> wrote:
>

> On Mon, 21 Jun 2021 16:00:36 +0200, Thierry Reding wrote:

> > 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
Krzysztof Kozlowski July 13, 2021, 8:27 a.m. UTC | #4 
On Mon, 12 Jul 2021 at 16:14, Rob Herring <robh+dt@kernel.org> wrote:
>

> On Tue, Jun 22, 2021 at 11:56 PM Krzysztof Kozlowski

> <krzysztof.kozlowski@canonical.com> wrote:

> >

> > On Mon, 21 Jun 2021 16:00:36 +0200, Thierry Reding wrote:

> > > 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.


To memory controller drivers tree. Pushed to soc folks some time ago:
https://lore.kernel.org/lkml/20210625073604.13562-1-krzysztof.kozlowski@canonical.com/

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

Best regards,
Krzysztof
Krzysztof Kozlowski July 20, 2021, 3:47 p.m. UTC | #5 
On Tue, 13 Jul 2021 at 10:27, Krzysztof Kozlowski
<krzysztof.kozlowski@canonical.com> wrote:
>

> On Mon, 12 Jul 2021 at 16:14, Rob Herring <robh+dt@kernel.org> wrote:

> >

> > On Tue, Jun 22, 2021 at 11:56 PM Krzysztof Kozlowski

> > <krzysztof.kozlowski@canonical.com> wrote:

> > >

> > > On Mon, 21 Jun 2021 16:00:36 +0200, Thierry Reding wrote:

> > > > 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.

>

> To memory controller drivers tree. Pushed to soc folks some time ago:

> https://lore.kernel.org/lkml/20210625073604.13562-1-krzysztof.kozlowski@canonical.com/


Hi Rob,

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

Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
index 1181b590db71..03f2b2d4db30 100644
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@ -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