The Mitsubishi AA104XD12 Device Tree binding doesn't really add any
useful content that is not already present in the panel-lvds binding
aside from a requirement on the data-mapping.
Let's move it to the generic panel-lvds binding
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
---
.../bindings/display/panel/lvds.yaml | 12 ++++
.../display/panel/mitsubishi,aa104xd12.yaml | 70 -------------------
2 files changed, 12 insertions(+), 70 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml
diff --git a/Documentation/devicetree/bindings/display/panel/lvds.yaml b/Documentation/devicetree/bindings/display/panel/lvds.yaml
index 91a6d97a96e0..09a818a60f2e 100644
--- a/Documentation/devicetree/bindings/display/panel/lvds.yaml
+++ b/Documentation/devicetree/bindings/display/panel/lvds.yaml
@@ -28,6 +28,17 @@ description: |+
allOf:
- $ref: panel-common.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: mitsubishi,aa104xd12
+
+ then:
+ properties:
+ data-mapping:
+ const: jeida-18
+
- if:
properties:
compatible:
@@ -60,6 +71,7 @@ properties:
- advantech,idk-1110wr
- advantech,idk-2121wr
- innolux,ee101ia-01d
+ - mitsubishi,aa104xd12
- const: panel-lvds
data-mapping:
diff --git a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml
deleted file mode 100644
index 2d1c85e377cd..000000000000
--- a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/display/panel/mitsubishi,aa104xd12.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Mitsubishi AA104XD12 10.4" XGA LVDS Display Panel
-
-maintainers:
- - Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
- - Thierry Reding <thierry.reding@xxxxxxxxx>
-
-allOf:
- - $ref: lvds.yaml#
-
-properties:
- compatible:
- items:
- - const: mitsubishi,aa104xd12
- - {} # panel-lvds, but not listed here to avoid false select
-
- data-mapping:
- const: jeida-18
-
- width-mm:
- const: 210
-
- height-mm:
- const: 158
-
- panel-timing: true
- port: true
-
-additionalProperties: false
-
-required:
- - compatible
-
-examples:
- - |+
-
- panel {
- compatible = "mitsubishi,aa104xd12", "panel-lvds";
-
- width-mm = <210>;
- height-mm = <158>;
-
- data-mapping = "jeida-18";
-
- panel-timing {
- /* 1024x768 @65Hz */
- clock-frequency = <65000000>;
- hactive = <1024>;
- vactive = <768>;
- hsync-len = <136>;
- hfront-porch = <20>;
- hback-porch = <160>;
- vfront-porch = <3>;
- vback-porch = <29>;
- vsync-len = <6>;
- };
-
- port {
- panel_in: endpoint {
- remote-endpoint = <&lvds_encoder>;
- };
- };
- };
-
-...
--
2.31.1
