diff mbox series

[v3,1/2] dt-bindings: mmc: renesas,sdhi: Fix dtbs-check warning

Message ID 20210804161325.26996-2-biju.das.jz@bp.renesas.com (mailing list archive)
State New, archived
Headers show
Series Document RZ/G2L SDHI controller bindings. | expand

Commit Message

Biju Das Aug. 4, 2021, 4:13 p.m. UTC 
Fix dtbs-check warning pinctrl-names:0:'default' was expected
for r8a77470-iwg23s-sbc.dts file.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v3:
 * New patch to fix the dtbs-check warnings
 Ref:- https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20210804091940.23983-1-biju.das.jz@bp.renesas.com/
---
 .../devicetree/bindings/mmc/renesas,sdhi.yaml | 65 ++++++++++++-------
 1 file changed, 42 insertions(+), 23 deletions(-)

Comments

Rob Herring (Arm) Aug. 13, 2021, 5:39 p.m. UTC | #1 
On Wed, Aug 04, 2021 at 05:13:24PM +0100, Biju Das wrote:
> Fix dtbs-check warning pinctrl-names:0:'default' was expected
> for r8a77470-iwg23s-sbc.dts file.
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v3:
>  * New patch to fix the dtbs-check warnings
>  Ref:- https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20210804091940.23983-1-biju.das.jz@bp.renesas.com/
> ---
>  .../devicetree/bindings/mmc/renesas,sdhi.yaml | 65 ++++++++++++-------
>  1 file changed, 42 insertions(+), 23 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> index 677989bc5924..543eeb825dc3 100644
> --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> @@ -9,9 +9,6 @@ title: Renesas SDHI SD/MMC controller
>  maintainers:
>    - Wolfram Sang <wsa+renesas@sang-engineering.com>
>  
> -allOf:
> -  - $ref: "mmc-controller.yaml"
> -
>  properties:
>    compatible:
>      oneOf:
> @@ -104,14 +101,51 @@ properties:
>    pinctrl-1:
>      maxItems: 1
>  
> -  pinctrl-names:
> -    minItems: 1
> -    items:
> -      - const: default
> -      - const: state_uhs
> +  pinctrl-names: true
>  
>    max-frequency: true
>  
> +allOf:
> +  - $ref: "mmc-controller.yaml"
> +
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: renesas,sdhi-mmc-r8a77470
> +    then:
> +      properties:
> +        pinctrl-names:
> +          items:
> +            - const: state_uhs
> +    else:
> +      properties:
> +        pinctrl-names:
> +          minItems: 1
> +          items:
> +            - const: default
> +            - const: state_uhs
> +
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            enum:
> +              - renesas,sdhi-r7s72100
> +              - renesas,sdhi-r7s9210
> +    then:
> +      properties:
> +        clock-names:
> +          items:
> +            - const: core
> +            - const: cd

This is already defined in the main section, no need for it here.

> +      required:
> +        - clock-names
> +      description:
> +        The internal card detection logic that exists in these controllers is
> +        sectioned off to be run by a separate second clock source to allow
> +        the main core clock to be turned off to save power.
> +
>  required:
>    - compatible
>    - reg
> @@ -119,21 +153,6 @@ required:
>    - clocks
>    - power-domains
>  
> -if:
> -  properties:
> -    compatible:
> -      contains:
> -        enum:
> -          - renesas,sdhi-r7s72100
> -          - renesas,sdhi-r7s9210
> -then:
> -  required:
> -    - clock-names
> -  description:
> -    The internal card detection logic that exists in these controllers is
> -    sectioned off to be run by a separate second clock source to allow
> -    the main core clock to be turned off to save power.
> -
>  unevaluatedProperties: false
>  
>  examples:
> -- 
> 2.17.1
> 
>
Biju Das Aug. 13, 2021, 6:03 p.m. UTC | #2 
Hi Rob,

Thanks for the feedback.

> Subject: Re: [PATCH v3 1/2] dt-bindings: mmc: renesas,sdhi: Fix dtbs-check
> warning
> 
> On Wed, Aug 04, 2021 at 05:13:24PM +0100, Biju Das wrote:
> > Fix dtbs-check warning pinctrl-names:0:'default' was expected for
> > r8a77470-iwg23s-sbc.dts file.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > v3:
> >  * New patch to fix the dtbs-check warnings
> >  Ref:-
> > https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatc
> > hwork.ozlabs.org%2Fproject%2Fdevicetree-bindings%2Fpatch%2F20210804091
> > 940.23983-1-biju.das.jz%40bp.renesas.com%2F&amp;data=04%7C01%7Cbiju.da
> > s.jz%40bp.renesas.com%7C265c317c047442b7b49608d95e815cb6%7C53d82571da1
> > 947e49cb4625a166a4a2a%7C0%7C0%7C637644731970005717%7CUnknown%7CTWFpbGZ
> > sb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3
> > D%7C1000&amp;sdata=q4IgcCqJJPRomA3mhjkRNNdnSbgewIYAvhfBps6Y0Ng%3D&amp;
> > reserved=0
> > ---
> >  .../devicetree/bindings/mmc/renesas,sdhi.yaml | 65
> > ++++++++++++-------
> >  1 file changed, 42 insertions(+), 23 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> > b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> > index 677989bc5924..543eeb825dc3 100644
> > --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> > +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
> > @@ -9,9 +9,6 @@ title: Renesas SDHI SD/MMC controller
> >  maintainers:
> >    - Wolfram Sang <wsa+renesas@sang-engineering.com>
> >
> > -allOf:
> > -  - $ref: "mmc-controller.yaml"
> > -
> >  properties:
> >    compatible:
> >      oneOf:
> > @@ -104,14 +101,51 @@ properties:
> >    pinctrl-1:
> >      maxItems: 1
> >
> > -  pinctrl-names:
> > -    minItems: 1
> > -    items:
> > -      - const: default
> > -      - const: state_uhs
> > +  pinctrl-names: true
> >
> >    max-frequency: true
> >
> > +allOf:
> > +  - $ref: "mmc-controller.yaml"
> > +
> > +  - if:
> > +      properties:
> > +        compatible:
> > +          contains:
> > +            const: renesas,sdhi-mmc-r8a77470
> > +    then:
> > +      properties:
> > +        pinctrl-names:
> > +          items:
> > +            - const: state_uhs
> > +    else:
> > +      properties:
> > +        pinctrl-names:
> > +          minItems: 1
> > +          items:
> > +            - const: default
> > +            - const: state_uhs
> > +
> > +  - if:
> > +      properties:
> > +        compatible:
> > +          contains:
> > +            enum:
> > +              - renesas,sdhi-r7s72100
> > +              - renesas,sdhi-r7s9210
> > +    then:
> > +      properties:
> > +        clock-names:
> > +          items:
> > +            - const: core
> > +            - const: cd
> 
> This is already defined in the main section, no need for it here.

Thanks missed it. Will fix it in the next version

Cheers,
Biju

> 
> > +      required:
> > +        - clock-names
> > +      description:
> > +        The internal card detection logic that exists in these
> controllers is
> > +        sectioned off to be run by a separate second clock source to
> allow
> > +        the main core clock to be turned off to save power.
> > +
> >  required:
> >    - compatible
> >    - reg
> > @@ -119,21 +153,6 @@ required:
> >    - clocks
> >    - power-domains
> >
> > -if:
> > -  properties:
> > -    compatible:
> > -      contains:
> > -        enum:
> > -          - renesas,sdhi-r7s72100
> > -          - renesas,sdhi-r7s9210
> > -then:
> > -  required:
> > -    - clock-names
> > -  description:
> > -    The internal card detection logic that exists in these controllers
> is
> > -    sectioned off to be run by a separate second clock source to allow
> > -    the main core clock to be turned off to save power.
> > -
> >  unevaluatedProperties: false
> >
> >  examples:
> > --
> > 2.17.1
> >
> >
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
index 677989bc5924..543eeb825dc3 100644
--- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
+++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
@@ -9,9 +9,6 @@  title: Renesas SDHI SD/MMC controller
 maintainers:
   - Wolfram Sang <wsa+renesas@sang-engineering.com>
 
-allOf:
-  - $ref: "mmc-controller.yaml"
-
 properties:
   compatible:
     oneOf:
@@ -104,14 +101,51 @@  properties:
   pinctrl-1:
     maxItems: 1
 
-  pinctrl-names:
-    minItems: 1
-    items:
-      - const: default
-      - const: state_uhs
+  pinctrl-names: true
 
   max-frequency: true
 
+allOf:
+  - $ref: "mmc-controller.yaml"
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: renesas,sdhi-mmc-r8a77470
+    then:
+      properties:
+        pinctrl-names:
+          items:
+            - const: state_uhs
+    else:
+      properties:
+        pinctrl-names:
+          minItems: 1
+          items:
+            - const: default
+            - const: state_uhs
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - renesas,sdhi-r7s72100
+              - renesas,sdhi-r7s9210
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: core
+            - const: cd
+      required:
+        - clock-names
+      description:
+        The internal card detection logic that exists in these controllers is
+        sectioned off to be run by a separate second clock source to allow
+        the main core clock to be turned off to save power.
+
 required:
   - compatible
   - reg
@@ -119,21 +153,6 @@  required:
   - clocks
   - power-domains
 
-if:
-  properties:
-    compatible:
-      contains:
-        enum:
-          - renesas,sdhi-r7s72100
-          - renesas,sdhi-r7s9210
-then:
-  required:
-    - clock-names
-  description:
-    The internal card detection logic that exists in these controllers is
-    sectioned off to be run by a separate second clock source to allow
-    the main core clock to be turned off to save power.
-
 unevaluatedProperties: false
 
 examples: