[PATCH v2 01/36] dt-bindings: display: allow port and ports in panel-lvds

Rob Herring robh at kernel.org
Thu Apr 9 16:11:10 UTC 2020


On Wed, Apr 8, 2020 at 1:51 PM Sam Ravnborg <sam at ravnborg.org> wrote:
>
> Both port and ports names may be used.
> port - for a single port
> ports - if there is more than one port in sub-nodes
>
> Fixes the following warning:
> advantech,idk-2121wr.example.dt.yaml: panel-lvds: 'port' is a required property
>
> advantech,idk-2121wr.yaml needs several ports, so uses a ports node.
>
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: Fabrizio Castro <fabrizio.castro at bp.renesas.com>
> Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj at bp.renesas.com>
> Cc: Thierry Reding <thierry.reding at gmail.com>
> Cc: Sam Ravnborg <sam at ravnborg.org>
> ---
>  Documentation/devicetree/bindings/display/panel/lvds.yaml | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)


>
> diff --git a/Documentation/devicetree/bindings/display/panel/lvds.yaml b/Documentation/devicetree/bindings/display/panel/lvds.yaml
> index d0083301acbe..f9132d50821c 100644
> --- a/Documentation/devicetree/bindings/display/panel/lvds.yaml
> +++ b/Documentation/devicetree/bindings/display/panel/lvds.yaml
> @@ -102,6 +102,12 @@ required:
>    - width-mm
>    - height-mm
>    - panel-timing
> -  - port
> +
> +if:
> +  required:
> +    - port
> +else:
> +  required:
> +    - ports

Humm, I guess 'then' is not required. That's a bit weird IMO.

I usually do a 'oneOf' for these cases.

Either way, please apply this to drm-misc-fixes (or
drm-misc-next-fixes depending on the state of the tree). Or I can take
it. I'd like to get all the warnings cleared up by rc2.

Reviewed-by: Rob Herring <robh at kernel.org>

Rob


More information about the dri-devel mailing list