]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dt-bindings: simple-framebuffer: Add requirement for pipelines
authorMaxime Ripard <maxime.ripard@bootlin.com>
Wed, 3 Jul 2019 09:55:11 +0000 (11:55 +0200)
committerRob Herring <robh@kernel.org>
Wed, 3 Jul 2019 19:18:50 +0000 (13:18 -0600)
Both the allwinner and amlogic compatibles require that either the
allwinner,pipeline or the amlogic,pipeline property is set. This was
dropped during the conversion since we didn't have conditionals back then,
but we can express this properly now.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Documentation/devicetree/bindings/display/simple-framebuffer.yaml

index c8d73ef010b5127e9dabc47b70d77efd028327f0..678776b6012a2b3effde9aa4b952fae5ea6b2027 100644 (file)
@@ -126,6 +126,28 @@ required:
   # but usually they will be filled by the bootloader.
   - compatible
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: allwinner,simple-framebuffer
+
+    then:
+      required:
+        - allwinner,pipeline
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amlogic,simple-framebuffer
+
+    then:
+      required:
+        - amlogic,pipeline
+
+
 additionalProperties: false
 
 examples:
@@ -140,6 +162,7 @@ examples:
       stdout-path = "display0";
       framebuffer0: framebuffer@1d385000 {
         compatible = "allwinner,simple-framebuffer", "simple-framebuffer";
+        allwinner,pipeline = "de_be0-lcd0";
         reg = <0x1d385000 3840000>;
         width = <1600>;
         height = <1200>;