diff mbox series

dt-bindings: display: bridge: lvds-codec: Fix duplicate key

Message ID 20211220125147.519880-1-thierry.reding@gmail.com
State Not Applicable, archived
Headers show
Series dt-bindings: display: bridge: lvds-codec: Fix duplicate key | expand

Checks

Context Check Description
robh/checkpatch warning total: 0 errors, 1 warnings, 53 lines checked
robh/dtbs-check success
robh/dt-meta-schema success

Commit Message

Thierry Reding Dec. 20, 2021, 12:51 p.m. UTC
From: Thierry Reding <treding@nvidia.com>

In order to validate multiple "if" conditionals, they must be part of an
"allOf:" list, otherwise they will cause a failure in parsing the schema
because of the duplicated "if" property.

Fixes: d7df3948eb49 ("dt-bindings: display: bridge: lvds-codec: Document pixel data sampling edge select")
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 .../bindings/display/bridge/lvds-codec.yaml   | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

Comments

Rob Herring Dec. 21, 2021, 2:12 a.m. UTC | #1
On Mon, Dec 20, 2021 at 8:51 AM Thierry Reding <thierry.reding@gmail.com> wrote:
>
> From: Thierry Reding <treding@nvidia.com>
>
> In order to validate multiple "if" conditionals, they must be part of an
> "allOf:" list, otherwise they will cause a failure in parsing the schema
> because of the duplicated "if" property.
>
> Fixes: d7df3948eb49 ("dt-bindings: display: bridge: lvds-codec: Document pixel data sampling edge select")
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  .../bindings/display/bridge/lvds-codec.yaml   | 43 ++++++++++---------
>  1 file changed, 22 insertions(+), 21 deletions(-)

Thanks!

Acked-by: Rob Herring <robh@kernel.org>
Rob Herring Dec. 22, 2021, 6:03 p.m. UTC | #2
On Mon, 20 Dec 2021 13:51:47 +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> In order to validate multiple "if" conditionals, they must be part of an
> "allOf:" list, otherwise they will cause a failure in parsing the schema
> because of the duplicated "if" property.
> 
> Fixes: d7df3948eb49 ("dt-bindings: display: bridge: lvds-codec: Document pixel data sampling edge select")
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  .../bindings/display/bridge/lvds-codec.yaml   | 43 ++++++++++---------
>  1 file changed, 22 insertions(+), 21 deletions(-)
> 

I went ahead and applied to drm-misc, so linux-next is fixed. 

Rob
Marek Vasut Dec. 22, 2021, 7:17 p.m. UTC | #3
On 12/22/21 19:03, Rob Herring wrote:
> On Mon, 20 Dec 2021 13:51:47 +0100, Thierry Reding wrote:
>> From: Thierry Reding <treding@nvidia.com>
>>
>> In order to validate multiple "if" conditionals, they must be part of an
>> "allOf:" list, otherwise they will cause a failure in parsing the schema
>> because of the duplicated "if" property.
>>
>> Fixes: d7df3948eb49 ("dt-bindings: display: bridge: lvds-codec: Document pixel data sampling edge select")
>> Signed-off-by: Thierry Reding <treding@nvidia.com>
>> ---
>>   .../bindings/display/bridge/lvds-codec.yaml   | 43 ++++++++++---------
>>   1 file changed, 22 insertions(+), 21 deletions(-)
>>
> 
> I went ahead and applied to drm-misc, so linux-next is fixed.

Thank you
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
index 708de84ac138..5079c1cc337b 100644
--- a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
@@ -94,31 +94,32 @@  properties:
 
   power-supply: true
 
-if:
-  not:
-    properties:
-      compatible:
-        contains:
-          const: lvds-decoder
-then:
-  properties:
-    ports:
+allOf:
+  - if:
+      not:
+        properties:
+          compatible:
+            contains:
+              const: lvds-decoder
+    then:
       properties:
-        port@0:
+        ports:
           properties:
-            endpoint:
+            port@0:
               properties:
-                data-mapping: false
+                endpoint:
+                  properties:
+                    data-mapping: false
 
-if:
-  not:
-    properties:
-      compatible:
-        contains:
-          const: lvds-encoder
-then:
-  properties:
-    pclk-sample: false
+  - if:
+      not:
+        properties:
+          compatible:
+            contains:
+              const: lvds-encoder
+    then:
+      properties:
+        pclk-sample: false
 
 required:
   - compatible