[PATCH] dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries

Aswath Govindraju a-govindraju at ti.com
Mon Sep 13 04:32:55 UTC 2021


On 10/09/21 10:21 pm, Rob Herring wrote:
> 'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum'
> is more concise and yields better error messages.
> 
> Fix a couple more cases which have appeared.
> 
> Cc: Rob Clark <robdclark at gmail.com>
> Cc: Sean Paul <sean at poorly.run>
> Cc: Mark Brown <broonie at kernel.org>
> Cc: Wim Van Sebroeck <wim at linux-watchdog.org>
> Cc: Guenter Roeck <linux at roeck-us.net>
> Cc: Jonathan Marek <jonathan at marek.ca>
> Cc: Aswath Govindraju <a-govindraju at ti.com>
> Cc: Marc Zyngier <maz at kernel.org>
> Cc: Linus Walleij <linus.walleij at linaro.org>
> Cc: dri-devel at lists.freedesktop.org
> Cc: freedreno at lists.freedesktop.org
> Cc: linux-spi at vger.kernel.org
> Cc: linux-watchdog at vger.kernel.org
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
>  .../bindings/display/msm/dsi-phy-7nm.yaml          |  8 ++++----
>  .../devicetree/bindings/spi/omap-spi.yaml          |  6 +++---

For omap-spi:

Acked-by: Aswath Govindraju <a-govindraju at ti.com>

>  .../bindings/watchdog/maxim,max63xx.yaml           | 14 +++++++-------
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml
> index 4265399bb154..c851770bbdf2 100644
> --- a/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml
> +++ b/Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml
> @@ -14,10 +14,10 @@ allOf:
>  
>  properties:
>    compatible:
> -    oneOf:
> -      - const: qcom,dsi-phy-7nm
> -      - const: qcom,dsi-phy-7nm-8150
> -      - const: qcom,sc7280-dsi-phy-7nm
> +    enum:
> +      - qcom,dsi-phy-7nm
> +      - qcom,dsi-phy-7nm-8150
> +      - qcom,sc7280-dsi-phy-7nm
>  
>    reg:
>      items:
> diff --git a/Documentation/devicetree/bindings/spi/omap-spi.yaml b/Documentation/devicetree/bindings/spi/omap-spi.yaml
> index e55538186cf6..9952199cae11 100644
> --- a/Documentation/devicetree/bindings/spi/omap-spi.yaml
> +++ b/Documentation/devicetree/bindings/spi/omap-spi.yaml
> @@ -84,9 +84,9 @@ unevaluatedProperties: false
>  if:
>    properties:
>      compatible:
> -      oneOf:
> -        - const: ti,omap2-mcspi
> -        - const: ti,omap4-mcspi
> +      enum:
> +        - ti,omap2-mcspi
> +        - ti,omap4-mcspi
>  
>  then:
>    properties:
> diff --git a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
> index f2105eedac2c..ab9641e845db 100644
> --- a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
> @@ -15,13 +15,13 @@ maintainers:
>  
>  properties:
>    compatible:
> -    oneOf:
> -      - const: maxim,max6369
> -      - const: maxim,max6370
> -      - const: maxim,max6371
> -      - const: maxim,max6372
> -      - const: maxim,max6373
> -      - const: maxim,max6374
> +    enum:
> +      - maxim,max6369
> +      - maxim,max6370
> +      - maxim,max6371
> +      - maxim,max6372
> +      - maxim,max6373
> +      - maxim,max6374
>  
>    reg:
>      description: This is a 1-byte memory-mapped address
> 



More information about the dri-devel mailing list