* [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
@ 2021-06-21 14:00 Thierry Reding
2021-06-22 16:24 ` Rob Herring
2021-06-23 5:56 ` Krzysztof Kozlowski
0 siblings, 2 replies; 6+ messages in thread
From: Thierry Reding @ 2021-06-21 14:00 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: devicetree, Rob Herring, Will Deacon, iommu, Rob Herring, Robin Murphy
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(-)
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
--
2.32.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
2021-06-21 14:00 [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax Thierry Reding
@ 2021-06-22 16:24 ` Rob Herring
2021-06-23 5:56 ` Krzysztof Kozlowski
1 sibling, 0 replies; 6+ messages in thread
From: Rob Herring @ 2021-06-22 16:24 UTC (permalink / raw)
To: Thierry Reding
Cc: devicetree, Krzysztof Kozlowski, Will Deacon, Linux IOMMU, Robin Murphy
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>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
2021-06-21 14:00 [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax Thierry Reding
2021-06-22 16:24 ` Rob Herring
@ 2021-06-23 5:56 ` Krzysztof Kozlowski
2021-07-12 14:14 ` Rob Herring
1 sibling, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-06-23 5:56 UTC (permalink / raw)
To: Thierry Reding
Cc: devicetree, Krzysztof Kozlowski, Will Deacon, iommu, Rob Herring,
Robin Murphy, Rob Herring
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>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
2021-06-23 5:56 ` Krzysztof Kozlowski
@ 2021-07-12 14:14 ` Rob Herring
2021-07-13 8:27 ` Krzysztof Kozlowski
0 siblings, 1 reply; 6+ messages in thread
From: Rob Herring @ 2021-07-12 14:14 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: devicetree, Will Deacon, Linux IOMMU, Thierry Reding, Robin Murphy
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
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
2021-07-12 14:14 ` Rob Herring
@ 2021-07-13 8:27 ` Krzysztof Kozlowski
2021-07-20 15:47 ` Krzysztof Kozlowski
0 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-07-13 8:27 UTC (permalink / raw)
To: Rob Herring, Arnd Bergmann, Olof Johansson
Cc: devicetree, Will Deacon, Linux IOMMU, Thierry Reding, Robin Murphy
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
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax
2021-07-13 8:27 ` Krzysztof Kozlowski
@ 2021-07-20 15:47 ` Krzysztof Kozlowski
0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-07-20 15:47 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski
Cc: devicetree, Arnd Bergmann, Robin Murphy, Linux IOMMU,
Thierry Reding, Will Deacon
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
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-20 15:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-21 14:00 [PATCH] dt-bindings: arm-smmu: Fix json-schema syntax Thierry Reding
2021-06-22 16:24 ` Rob Herring
2021-06-23 5:56 ` Krzysztof Kozlowski
2021-07-12 14:14 ` Rob Herring
2021-07-13 8:27 ` Krzysztof Kozlowski
2021-07-20 15:47 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).