[PATCH] dt-bindings: display: mediatek: simplify compatibles syntax
Matthias Brugger
matthias.bgg at gmail.com
Fri Apr 14 16:47:21 UTC 2023
On 14/04/2023 10:33, Krzysztof Kozlowski wrote:
> Lists (items) with one item should be just enum because it is shorter,
> simpler and does not confuse, if one wants to add new entry with a
> fallback. Convert all of them to enums. OTOH, leave unused "oneOf"
> entries in anticipation of further growth of the entire binding.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
Reviewed-by: Matthias Brugger <matthias.bgg at gmail.com>
>
> ---
>
> Cc: angelogioacchino.delregno at collabora.com
> ---
> .../bindings/display/mediatek/mediatek,ccorr.yaml | 7 +++----
> .../bindings/display/mediatek/mediatek,color.yaml | 10 ++++------
> .../bindings/display/mediatek/mediatek,dither.yaml | 4 ++--
> .../bindings/display/mediatek/mediatek,dsc.yaml | 4 ++--
> .../bindings/display/mediatek/mediatek,gamma.yaml | 7 +++----
> .../bindings/display/mediatek/mediatek,merge.yaml | 7 +++----
> .../bindings/display/mediatek/mediatek,od.yaml | 7 +++----
> .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 7 +++----
> .../bindings/display/mediatek/mediatek,ovl.yaml | 13 +++++--------
> .../display/mediatek/mediatek,postmask.yaml | 4 ++--
> .../bindings/display/mediatek/mediatek,rdma.yaml | 13 +++++--------
> .../bindings/display/mediatek/mediatek,split.yaml | 4 ++--
> .../bindings/display/mediatek/mediatek,ufoe.yaml | 4 ++--
> .../bindings/display/mediatek/mediatek,wdma.yaml | 4 ++--
> 14 files changed, 41 insertions(+), 54 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
> index b04820c95b22..dc22bd522523 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
> @@ -21,10 +21,9 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8183-disp-ccorr
> - - items:
> - - const: mediatek,mt8192-disp-ccorr
> + - enum:
> + - mediatek,mt8183-disp-ccorr
> + - mediatek,mt8192-disp-ccorr
> - items:
> - enum:
> - mediatek,mt8188-disp-ccorr
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml
> index 62306c88f485..d0ea77fc4b06 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml
> @@ -22,12 +22,10 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt2701-disp-color
> - - items:
> - - const: mediatek,mt8167-disp-color
> - - items:
> - - const: mediatek,mt8173-disp-color
> + - enum:
> + - mediatek,mt2701-disp-color
> + - mediatek,mt8167-disp-color
> + - mediatek,mt8173-disp-color
> - items:
> - enum:
> - mediatek,mt7623-disp-color
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
> index 5c7445c174e5..1588b3f7cec7 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
> @@ -22,8 +22,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8183-disp-dither
> + - enum:
> + - mediatek,mt8183-disp-dither
> - items:
> - enum:
> - mediatek,mt8186-disp-dither
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml
> index 49248864514b..2cbdd9ee449d 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsc.yaml
> @@ -20,8 +20,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8195-disp-dsc
> + - enum:
> + - mediatek,mt8195-disp-dsc
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml
> index a5c6a91fac71..6c2be9d6840b 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml
> @@ -21,10 +21,9 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8173-disp-gamma
> - - items:
> - - const: mediatek,mt8183-disp-gamma
> + - enum:
> + - mediatek,mt8173-disp-gamma
> + - mediatek,mt8183-disp-gamma
> - items:
> - enum:
> - mediatek,mt8186-disp-gamma
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml
> index 69ba75777dac..2f8e2f4dc3b8 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,merge.yaml
> @@ -21,10 +21,9 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8173-disp-merge
> - - items:
> - - const: mediatek,mt8195-disp-merge
> + - enum:
> + - mediatek,mt8173-disp-merge
> + - mediatek,mt8195-disp-merge
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml
> index 853fcb9db2be..29f9fa8f8219 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,od.yaml
> @@ -21,10 +21,9 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt2712-disp-od
> - - items:
> - - const: mediatek,mt8173-disp-od
> + - enum:
> + - mediatek,mt2712-disp-od
> + - mediatek,mt8173-disp-od
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
> index 4e94f4e947ad..c7dd0ef02dcf 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
> @@ -21,10 +21,9 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8183-disp-ovl-2l
> - - items:
> - - const: mediatek,mt8192-disp-ovl-2l
> + - enum:
> + - mediatek,mt8183-disp-ovl-2l
> + - mediatek,mt8192-disp-ovl-2l
> - items:
> - enum:
> - mediatek,mt8186-disp-ovl-2l
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
> index 065e526f950e..92e320d54ba2 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml
> @@ -21,14 +21,11 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt2701-disp-ovl
> - - items:
> - - const: mediatek,mt8173-disp-ovl
> - - items:
> - - const: mediatek,mt8183-disp-ovl
> - - items:
> - - const: mediatek,mt8192-disp-ovl
> + - enum:
> + - mediatek,mt2701-disp-ovl
> + - mediatek,mt8173-disp-ovl
> + - mediatek,mt8183-disp-ovl
> + - mediatek,mt8192-disp-ovl
> - items:
> - enum:
> - mediatek,mt7623-disp-ovl
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
> index 27de64495401..11fe32e50a59 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
> @@ -21,8 +21,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8192-disp-postmask
> + - enum:
> + - mediatek,mt8192-disp-postmask
> - items:
> - enum:
> - mediatek,mt8186-disp-postmask
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
> index 3ade2ece3fed..42059efad45d 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml
> @@ -23,14 +23,11 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt2701-disp-rdma
> - - items:
> - - const: mediatek,mt8173-disp-rdma
> - - items:
> - - const: mediatek,mt8183-disp-rdma
> - - items:
> - - const: mediatek,mt8195-disp-rdma
> + - enum:
> + - mediatek,mt2701-disp-rdma
> + - mediatek,mt8173-disp-rdma
> + - mediatek,mt8183-disp-rdma
> + - mediatek,mt8195-disp-rdma
> - items:
> - enum:
> - mediatek,mt8188-disp-rdma
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml
> index 35ace1f322e8..21a4e96ecd93 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml
> @@ -21,8 +21,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8173-disp-split
> + - enum:
> + - mediatek,mt8173-disp-split
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml
> index b8bb135fe96b..62fad23a26f5 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ufoe.yaml
> @@ -22,8 +22,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8173-disp-ufoe
> + - enum:
> + - mediatek,mt8173-disp-ufoe
>
> reg:
> maxItems: 1
> diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
> index 7d7cc1ab526b..991183165d29 100644
> --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
> +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,wdma.yaml
> @@ -21,8 +21,8 @@ description: |
> properties:
> compatible:
> oneOf:
> - - items:
> - - const: mediatek,mt8173-disp-wdma
> + - enum:
> + - mediatek,mt8173-disp-wdma
>
> reg:
> maxItems: 1
More information about the dri-devel
mailing list