Skip to contentSkip to conversation

dt-bindings: display: Turn lvds.yaml into a generic schema

PATCH Applied Maxime Ripard 1 participant 3 messages Jan 27, 2022 – Feb 2, 2022

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 dt-bindings: display: Turn lvds.yaml into a generic schema

The lvds.yaml file so far was both defining the generic LVDS properties (such as data-mapping) that could be used for any LVDS sink, but also the panel-lvds binding.

That last binding was to describe LVDS panels simple enough, and had a number of other bindings using it as a base to specialise it further.

However, this situation makes it fairly hard to extend and reuse both the generic parts, and the panel-lvds itself.

Let's remove the panel-lvds parts and leave only the generic LVDS properties.

---

Changes from v3:
- Adjust documentation a bit

Changes from v2:
- Fix references to that file

Changes from v1:
- Moved the schema out of panel

---
 .../bindings/display/bridge/lvds-codec.yaml   |  2 +-
 .../bindings/display/{panel => }/lvds.yaml    | 35 +++----------------
 .../display/panel/advantech,idk-1110wr.yaml   | 19 ++++++++--
 .../display/panel/innolux,ee101ia-01d.yaml    | 23 ++++++++++--
 .../display/panel/mitsubishi,aa104xd12.yaml   | 19 ++++++++--
 .../display/panel/mitsubishi,aa121td01.yaml   | 19 ++++++++--
 .../display/panel/sgd,gktw70sdae4se.yaml      | 19 ++++++++--
 MAINTAINERS                                   |  2 +-
 8 files changed, 95 insertions(+), 43 deletions(-)
 rename Documentation/devicetree/bindings/display/{panel => }/lvds.yaml (84%)
Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml +1 -1
index 5079c1cc337b..27b905b81b12 100644
@@ -67,7 +67,7 @@ properties:
                   - vesa-24
                 description: |
                   The color signals mapping order. See details in
-                  Documentation/devicetree/bindings/display/panel/lvds.yaml
+                  Documentation/devicetree/bindings/display/lvds.yaml
 
       port@1:
         $ref: /schemas/graph.yaml#/properties/port
Documentation/devicetree/bindings/display/lvds.yaml renamed from Documentation/devicetree/bindings/display/panel/lvds.yaml +4 -31
similarity index 84%
rename from Documentation/devicetree/bindings/display/panel/lvds.yaml
rename to Documentation/devicetree/bindings/display/lvds.yaml
index 49460c9dceea..7cd2ce7e9c33 100644
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/display/panel/lvds.yaml#
+$id: http://devicetree.org/schemas/display/lvds.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: LVDS Display Panel
+title: LVDS Display Common Properties
 
 maintainers:
   - Laurent Pinchart <[email protected]>
@@ -13,8 +13,8 @@ maintainers:
 description: |+
   LVDS is a physical layer specification defined in ANSI/TIA/EIA-644-A. Multiple
   incompatible data link layers have been used over time to transmit image data
-  to LVDS panels. This bindings supports display panels compatible with the
-  following specifications.
+  to LVDS devices. This bindings supports devices compatible with the following
+  specifications.
 
   [JEIDA] "Digital Interface Standards for Monitor", JEIDA-59-1999, February
   1999 (Version 1.0), Japan Electronic Industry Development Association (JEIDA)
@@ -26,18 +26,7 @@ description: |+
   Device compatible with those specifications have been marketed under the
   FPD-Link and FlatLink brands.
 
-allOf:
-  - $ref: panel-common.yaml#
-
 properties:
-  compatible:
-    contains:
-      const: panel-lvds
-    description:
-      Shall contain "panel-lvds" in addition to a mandatory panel-specific
-      compatible string defined in individual panel bindings. The "panel-lvds"
-      value shall never be used on its own.
-
   data-mapping:
     enum:
       - jeida-18
@@ -96,22 +85,6 @@ properties:
       If set, reverse the bit order described in the data mappings below on all
       data lanes, transmitting bits for slots 6 to 0 instead of 0 to 6.
 
-  port: true
-  ports: true
-
-required:
-  - compatible
-  - data-mapping
-  - width-mm
-  - height-mm
-  - panel-timing
-
-oneOf:
-  - required:
-      - port
-  - required:
-      - ports
-
 additionalProperties: true
 
 ...
Documentation/devicetree/bindings/display/panel/advantech,idk-1110wr.yaml +17 -2
index 93878c2cd370..3a8c2c11f9bd 100644
@@ -11,13 +11,23 @@ maintainers:
   - Thierry Reding <[email protected]>
 
 allOf:
-  - $ref: lvds.yaml#
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        const: advantech,idk-1110wr
+
+  required:
+    - compatible
 
 properties:
   compatible:
     items:
       - const: advantech,idk-1110wr
-      - {} # panel-lvds, but not listed here to avoid false select
+      - const: panel-lvds
 
   data-mapping:
     const: jeida-24
@@ -35,6 +45,11 @@ additionalProperties: false
 
 required:
   - compatible
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
+  - port
 
 examples:
   - |+
Documentation/devicetree/bindings/display/panel/innolux,ee101ia-01d.yaml +21 -2
index a69681e724cb..566e11f6bfc0 100644
@@ -11,15 +11,26 @@ maintainers:
   - Thierry Reding <[email protected]>
 
 allOf:
-  - $ref: lvds.yaml#
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        const: innolux,ee101ia-01d
+
+  required:
+    - compatible
 
 properties:
   compatible:
     items:
       - const: innolux,ee101ia-01d
-      - {} # panel-lvds, but not listed here to avoid false select
+      - const: panel-lvds
 
   backlight: true
+  data-mapping: true
   enable-gpios: true
   power-supply: true
   width-mm: true
@@ -27,5 +38,13 @@ properties:
   panel-timing: true
   port: true
 
+required:
+  - compatible
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
+  - port
+
 additionalProperties: false
 ...
Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml +17 -2
index b5e7ee230fa6..5cf3c588f46d 100644
@@ -11,13 +11,23 @@ maintainers:
   - Thierry Reding <[email protected]>
 
 allOf:
-  - $ref: lvds.yaml#
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        const: mitsubishi,aa104xd12
+
+  required:
+    - compatible
 
 properties:
   compatible:
     items:
       - const: mitsubishi,aa104xd12
-      - {} # panel-lvds, but not listed here to avoid false select
+      - const: panel-lvds
 
   vcc-supply:
     description: Reference to the regulator powering the panel VCC pins.
@@ -39,6 +49,11 @@ additionalProperties: false
 required:
   - compatible
   - vcc-supply
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
+  - port
 
 examples:
   - |+
Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml +17 -2
index 977c50a85b67..54750cc5440d 100644
@@ -11,13 +11,23 @@ maintainers:
   - Thierry Reding <[email protected]>
 
 allOf:
-  - $ref: lvds.yaml#
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        const: mitsubishi,aa121td01
+
+  required:
+    - compatible
 
 properties:
   compatible:
     items:
       - const: mitsubishi,aa121td01
-      - {} # panel-lvds, but not listed here to avoid false select
+      - const: panel-lvds
 
   vcc-supply:
     description: Reference to the regulator powering the panel VCC pins.
@@ -39,6 +49,11 @@ additionalProperties: false
 required:
   - compatible
   - vcc-supply
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
+  - port
 
 examples:
   - |+
Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml +17 -2
index e63a570ae59d..44e02decdf3a 100644
@@ -11,13 +11,23 @@ maintainers:
   - Thierry Reding <[email protected]>
 
 allOf:
-  - $ref: lvds.yaml#
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        const: sgd,gktw70sdae4se
+
+  required:
+    - compatible
 
 properties:
   compatible:
     items:
       - const: sgd,gktw70sdae4se
-      - {} # panel-lvds, but not listed here to avoid false select
+      - const: panel-lvds
 
   data-mapping:
     const: jeida-18
@@ -35,6 +45,11 @@ additionalProperties: false
 
 required:
   - compatible
+  - port
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
 
 examples:
   - |+
MAINTAINERS +1 -1
index ea3e6c914384..3f679974e3fe 100644
@@ -6076,7 +6076,7 @@ L:	[email protected]
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 S:	Maintained
 F:	drivers/gpu/drm/panel/panel-lvds.c
-F:	Documentation/devicetree/bindings/display/panel/lvds.yaml
+F:	Documentation/devicetree/bindings/display/lvds.yaml
 
 DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 M:	Guido Günther <[email protected]>
Signature · 1 line
2.34.1
#1 lore raw

PATCH v4 2/2 dt-bindings: panel: Introduce a panel-lvds binding

Following the previous patch, let's introduce a generic panel-lvds binding that documents the panels that don't have any particular constraint documented.

---

Changes from v3:
- Rework compatible clause

Changes from v2:
- Added a MAINTAINERS entry

Changes from v1:
- Added missing compatible
- Fixed lint

---
 .../bindings/display/panel/panel-lvds.yaml    | 47 +++++++++++++++++++
 MAINTAINERS                                   |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
Documentation/devicetree/bindings/display/panel/panel-lvds.yaml new file +47 -0
new file mode 100644
index 000000000000..c092a040424b
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/panel/panel-lvds.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Generic LVDS Display Panel Device Tree Bindings
+
+maintainers:
+  - Lad Prabhakar <[email protected]>
+  - Thierry Reding <[email protected]>
+
+allOf:
+  - $ref: panel-common.yaml#
+  - $ref: /schemas/display/lvds.yaml/#
+
+select:
+  properties:
+    compatible:
+      contains:
+        enum:
+          - auo,b101ew05
+          - tbs,a711-panel
+
+  required:
+    - compatible
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - auo,b101ew05
+          - tbs,a711-panel
+
+      - const: panel-lvds
+
+unevaluatedProperties: false
+
+required:
+  - compatible
+  - data-mapping
+  - width-mm
+  - height-mm
+  - panel-timing
+  - port
+
+...
MAINTAINERS +1 -0
index 3f679974e3fe..8800765fc712 100644
@@ -6077,6 +6077,7 @@ T:	git git://anongit.freedesktop.org/drm/drm-misc
 S:	Maintained
 F:	drivers/gpu/drm/panel/panel-lvds.c
 F:	Documentation/devicetree/bindings/display/lvds.yaml
+F:	Documentation/devicetree/bindings/display/panel/panel-lvds.yaml
 
 DRM DRIVER FOR MANTIX MLAF057WE51 PANELS
 M:	Guido Günther <[email protected]>
Signature · 1 line
2.34.1
author Applied
#2 lore raw

Re: (subset) [PATCH v4 1/2] dt-bindings: display: Turn lvds.yaml into a generic schema

In reply to Maxime Ripard
Quoted 8 lines · Maxime Ripard

The lvds.yaml file so far was both defining the generic LVDS properties (such as data-mapping) that could be used for any LVDS sink, but also the panel-lvds binding.

That last binding was to describe LVDS panels simple enough, and had a number of other bindings using it as a base to specialise it further.

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime