[PATCH] dt-bindings: display: nvidia,tegra20-dc: Move 'rgb' node properties

[PATCH] dt-bindings: display: nvidia,tegra20-dc: Move 'rgb' node properties

[Rob Herring (Arm)]

Properties are supposed to be defined in the main schema and not in
conditional schemas. Move the properties for the 'rgb' node to the main
schema.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 .../display/tegra/nvidia,tegra20-dc.yaml      | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml
index 69be95afd562..a42bf7ed37a2 100644
--- a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml
+++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-dc.yaml
@@ -77,8 +77,27 @@ properties:
     description: A list of phandles of outputs that this display controller can drive.
 
   rgb:
+    description: Each display controller node has a child node that represents the
+      RGB output associated with the controller.
     type: object
 
+    properties:
+      nvidia,ddc-i2c-bus:
+        $ref: /schemas/types.yaml#/definitions/phandle
+        description: phandle of an I2C controller used for DDC EDID probing
+
+      nvidia,hpd-gpio:
+        description: specifies a GPIO used for hotplug detection
+        maxItems: 1
+
+      nvidia,edid:
+        $ref: /schemas/types.yaml#/definitions/uint8-array
+        description: supplies a binary EDID blob
+
+      nvidia,panel:
+        $ref: /schemas/types.yaml#/definitions/phandle
+        description: phandle of a display panel
+
 allOf:
   - if:
       properties:
@@ -105,27 +124,9 @@ allOf:
             - const: winb-vfilter
             - const: winc
             - const: cursor
-
-        rgb:
-          description: Each display controller node has a child node, named "rgb", that represents
-            the RGB output associated with the controller.
-          type: object
-          properties:
-            nvidia,ddc-i2c-bus:
-              $ref: /schemas/types.yaml#/definitions/phandle
-              description: phandle of an I2C controller used for DDC EDID probing
-
-            nvidia,hpd-gpio:
-              description: specifies a GPIO used for hotplug detection
-              maxItems: 1
-
-            nvidia,edid:
-              $ref: /schemas/types.yaml#/definitions/uint8-array
-              description: supplies a binary EDID blob
-
-            nvidia,panel:
-              $ref: /schemas/types.yaml#/definitions/phandle
-              description: phandle of a display panel
+    else:
+      properties:
+        rgb: false
 
   - if:
       properties:
-- 
2.53.0