dt-bindings: mmc: PL18x stop relying on order of dma-names

[PATCH] dt-bindings: mmc: PL18x stop relying on order of dma-names

Posted by David Heidelberg 4 years, 6 months ago

We don't care in which order are "rx" and "tx" DMA names supplied.

Fixes: 4df297aaeb9c ("dt-bindings: mmc: Add missing properties used in examples")

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 Documentation/devicetree/bindings/mmc/arm,pl18x.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
index f0a44b2cfa79..a4f74bec68a3 100644
--- a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
+++ b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
@@ -70,9 +70,13 @@ properties:
     maxItems: 2
 
   dma-names:
-    items:
-      - const: rx
-      - const: tx
+    oneOf:
+      - items:
+          - const: tx
+          - const: rx
+      - items:
+          - const: rx
+          - const: tx
 
   power-domains: true
 
-- 
2.34.1

Re: [PATCH] dt-bindings: mmc: PL18x stop relying on order of dma-names

Posted by Linus Walleij 4 years, 6 months ago

On Fri, Dec 24, 2021 at 8:25 PM David Heidelberg <david@ixit.cz> wrote:

> We don't care in which order are "rx" and "tx" DMA names supplied.
>
> Fixes: 4df297aaeb9c ("dt-bindings: mmc: Add missing properties used in examples")
>
> Signed-off-by: David Heidelberg <david@ixit.cz>

Good catch!
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] dt-bindings: mmc: PL18x stop relying on order of dma-names

Posted by Ulf Hansson 4 years, 6 months ago

On Fri, 24 Dec 2021 at 20:25, David Heidelberg <david@ixit.cz> wrote:
>
> We don't care in which order are "rx" and "tx" DMA names supplied.
>
> Fixes: 4df297aaeb9c ("dt-bindings: mmc: Add missing properties used in examples")
>
> Signed-off-by: David Heidelberg <david@ixit.cz>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  Documentation/devicetree/bindings/mmc/arm,pl18x.yaml | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> index f0a44b2cfa79..a4f74bec68a3 100644
> --- a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> +++ b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> @@ -70,9 +70,13 @@ properties:
>      maxItems: 2
>
>    dma-names:
> -    items:
> -      - const: rx
> -      - const: tx
> +    oneOf:
> +      - items:
> +          - const: tx
> +          - const: rx
> +      - items:
> +          - const: rx
> +          - const: tx
>
>    power-domains: true
>
> --
> 2.34.1
>

Re: [PATCH] dt-bindings: mmc: PL18x stop relying on order of dma-names

Posted by Rob Herring 4 years, 5 months ago

On Fri, Dec 24, 2021 at 08:25:45PM +0100, David Heidelberg wrote:
> We don't care in which order are "rx" and "tx" DMA names supplied.
> 

I do. Other than avoiding dts changes, why do we need undefined order 
here?

> Fixes: 4df297aaeb9c ("dt-bindings: mmc: Add missing properties used in examples")
> 

Drop the blank line.

> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  Documentation/devicetree/bindings/mmc/arm,pl18x.yaml | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> index f0a44b2cfa79..a4f74bec68a3 100644
> --- a/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> +++ b/Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
> @@ -70,9 +70,13 @@ properties:
>      maxItems: 2
>  
>    dma-names:
> -    items:
> -      - const: rx
> -      - const: tx
> +    oneOf:
> +      - items:
> +          - const: tx
> +          - const: rx
> +      - items:
> +          - const: rx
> +          - const: tx

For future reference, the concise way to express this is:

maxItems: 2
items:
  enum: [ rx, tx ]

>  
>    power-domains: true
>  
> -- 
> 2.34.1
> 
>