The Mitsubishi AA121TD01 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 | 5 +- .../display/panel/mitsubishi,aa121td01.yaml | 69 ------------------- 2 files changed, 4 insertions(+), 70 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml diff --git a/Documentation/devicetree/bindings/display/panel/lvds.yaml b/Documentation/devicetree/bindings/display/panel/lvds.yaml index 09a818a60f2e..22f6cf1e134d 100644 --- a/Documentation/devicetree/bindings/display/panel/lvds.yaml +++ b/Documentation/devicetree/bindings/display/panel/lvds.yaml @@ -32,7 +32,9 @@ allOf: properties: compatible: contains: - const: mitsubishi,aa104xd12 + enum: + - mitsubishi,aa104xd12 + - mitsubishi,aa121td01 then: properties: @@ -72,6 +74,7 @@ properties: - advantech,idk-2121wr - innolux,ee101ia-01d - mitsubishi,aa104xd12 + - mitsubishi,aa121td01 - const: panel-lvds data-mapping: diff --git a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml b/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml deleted file mode 100644 index 467a0ed4d444..000000000000 --- a/Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/display/panel/mitsubishi,aa121td01.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Mitsubishi AA121TD01 12.1" WXGA LVDS Display Panel - -maintainers: - - Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> - - Thierry Reding <thierry.reding@xxxxxxxxx> - -allOf: - - $ref: lvds.yaml# - -properties: - compatible: - items: - - const: mitsubishi,aa121td01 - - {} # panel-lvds, but not listed here to avoid false select - - data-mapping: - const: jeida-18 - - width-mm: - const: 261 - - height-mm: - const: 163 - - panel-timing: true - port: true - -additionalProperties: false - -required: - - compatible - -examples: - - |+ - panel { - compatible = "mitsubishi,aa121td01", "panel-lvds"; - - width-mm = <261>; - height-mm = <163>; - - data-mapping = "jeida-18"; - - panel-timing { - /* 1280x800 @60Hz */ - clock-frequency = <71000000>; - hactive = <1280>; - vactive = <800>; - hsync-len = <70>; - hfront-porch = <20>; - hback-porch = <70>; - vsync-len = <5>; - vfront-porch = <3>; - vback-porch = <15>; - }; - - port { - panel_in: endpoint { - remote-endpoint = <&lvds_encoder>; - }; - }; - }; - -... -- 2.31.1