diff mbox series

[v4,2/2] dt-bindings: mmc: renesas,sdhi: Document RZ/G2L bindings

Message ID 20210817090313.31858-3-biju.das.jz@bp.renesas.com
State New
Headers show
Series Document RZ/G2L SDHI controller bindings | expand

Commit Message

Biju Das Aug. 17, 2021, 9:03 a.m. UTC
Document RZ/G2L SDHI controller bindings.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v3->v4:
 * Defined clock-names for RZ/G2L SoC and make it as a required property
v2->v3:
 * split the patch into 2, first one for fixing dtbs-check issue and
   later one for documenting RZ/G2L SDHI bindings.
v1->v2:
 * Fixed dtbs-check issue for RZ/A{1,2} platforms.
---
 .../devicetree/bindings/mmc/renesas,sdhi.yaml | 73 +++++++++++++------
 1 file changed, 52 insertions(+), 21 deletions(-)

Comments

Ulf Hansson Aug. 24, 2021, 2:56 p.m. UTC | #1
On Tue, 17 Aug 2021 at 11:03, Biju Das <biju.das.jz@bp.renesas.com> wrote:
>

> Document RZ/G2L SDHI controller bindings.

>

> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>


Applied for next, thanks!

Kind regards
Uffe


> ---

> v3->v4:

>  * Defined clock-names for RZ/G2L SoC and make it as a required property

> v2->v3:

>  * split the patch into 2, first one for fixing dtbs-check issue and

>    later one for documenting RZ/G2L SDHI bindings.

> v1->v2:

>  * Fixed dtbs-check issue for RZ/A{1,2} platforms.

> ---

>  .../devicetree/bindings/mmc/renesas,sdhi.yaml | 73 +++++++++++++------

>  1 file changed, 52 insertions(+), 21 deletions(-)

>

> diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml

> index 43584f4f4c7e..9f1e7092cf44 100644

> --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml

> +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml

> @@ -44,19 +44,20 @@ properties:

>            - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)

>        - items:

>            - enum:

> -              - renesas,sdhi-r8a774a1 # RZ/G2M

> -              - renesas,sdhi-r8a774b1 # RZ/G2N

> -              - renesas,sdhi-r8a774c0 # RZ/G2E

> -              - renesas,sdhi-r8a774e1 # RZ/G2H

> -              - renesas,sdhi-r8a7795  # R-Car H3

> -              - renesas,sdhi-r8a7796  # R-Car M3-W

> -              - renesas,sdhi-r8a77961 # R-Car M3-W+

> -              - renesas,sdhi-r8a77965 # R-Car M3-N

> -              - renesas,sdhi-r8a77970 # R-Car V3M

> -              - renesas,sdhi-r8a77980 # R-Car V3H

> -              - renesas,sdhi-r8a77990 # R-Car E3

> -              - renesas,sdhi-r8a77995 # R-Car D3

> -              - renesas,sdhi-r8a779a0 # R-Car V3U

> +              - renesas,sdhi-r8a774a1  # RZ/G2M

> +              - renesas,sdhi-r8a774b1  # RZ/G2N

> +              - renesas,sdhi-r8a774c0  # RZ/G2E

> +              - renesas,sdhi-r8a774e1  # RZ/G2H

> +              - renesas,sdhi-r8a7795   # R-Car H3

> +              - renesas,sdhi-r8a7796   # R-Car M3-W

> +              - renesas,sdhi-r8a77961  # R-Car M3-W+

> +              - renesas,sdhi-r8a77965  # R-Car M3-N

> +              - renesas,sdhi-r8a77970  # R-Car V3M

> +              - renesas,sdhi-r8a77980  # R-Car V3H

> +              - renesas,sdhi-r8a77990  # R-Car E3

> +              - renesas,sdhi-r8a77995  # R-Car D3

> +              - renesas,sdhi-r8a779a0  # R-Car V3U

> +              - renesas,sdhi-r9a07g044 # RZ/G2{L,LC}

>            - const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2

>

>    reg:

> @@ -66,15 +67,9 @@ properties:

>      minItems: 1

>      maxItems: 3

>

> -  clocks:

> -    minItems: 1

> -    maxItems: 2

> +  clocks: true

>

> -  clock-names:

> -    minItems: 1

> -    items:

> -      - const: core

> -      - const: cd

> +  clock-names: true

>

>    dmas:

>      minItems: 4

> @@ -108,6 +103,42 @@ properties:

>  allOf:

>    - $ref: "mmc-controller.yaml"

>

> +  - if:

> +      properties:

> +        compatible:

> +          contains:

> +            const: renesas,sdhi-r9a07g044

> +    then:

> +      properties:

> +        clocks:

> +          items:

> +            - description: IMCLK, SDHI channel main clock1.

> +            - description: IMCLK2, SDHI channel main clock2. When this clock is

> +                           turned off, external SD card detection cannot be

> +                           detected.

> +            - description: CLK_HS, SDHI channel High speed clock which operates

> +                           4 times that of SDHI channel main clock1.

> +            - description: ACLK, SDHI channel bus clock.

> +        clock-names:

> +          items:

> +            - const: imclk

> +            - const: imclk2

> +            - const: clk_hs

> +            - const: aclk

> +      required:

> +        - clock-names

> +        - resets

> +    else:

> +      properties:

> +        clocks:

> +          minItems: 1

> +          maxItems: 2

> +        clock-names:

> +          minItems: 1

> +          items:

> +            - const: core

> +            - const: cd

> +

>    - if:

>        properties:

>          compatible:

> --

> 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 43584f4f4c7e..9f1e7092cf44 100644
--- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
+++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml
@@ -44,19 +44,20 @@  properties:
           - const: renesas,sdhi-mmc-r8a77470 # RZ/G1C (SDHI/MMC IP)
       - items:
           - enum:
-              - renesas,sdhi-r8a774a1 # RZ/G2M
-              - renesas,sdhi-r8a774b1 # RZ/G2N
-              - renesas,sdhi-r8a774c0 # RZ/G2E
-              - renesas,sdhi-r8a774e1 # RZ/G2H
-              - renesas,sdhi-r8a7795  # R-Car H3
-              - renesas,sdhi-r8a7796  # R-Car M3-W
-              - renesas,sdhi-r8a77961 # R-Car M3-W+
-              - renesas,sdhi-r8a77965 # R-Car M3-N
-              - renesas,sdhi-r8a77970 # R-Car V3M
-              - renesas,sdhi-r8a77980 # R-Car V3H
-              - renesas,sdhi-r8a77990 # R-Car E3
-              - renesas,sdhi-r8a77995 # R-Car D3
-              - renesas,sdhi-r8a779a0 # R-Car V3U
+              - renesas,sdhi-r8a774a1  # RZ/G2M
+              - renesas,sdhi-r8a774b1  # RZ/G2N
+              - renesas,sdhi-r8a774c0  # RZ/G2E
+              - renesas,sdhi-r8a774e1  # RZ/G2H
+              - renesas,sdhi-r8a7795   # R-Car H3
+              - renesas,sdhi-r8a7796   # R-Car M3-W
+              - renesas,sdhi-r8a77961  # R-Car M3-W+
+              - renesas,sdhi-r8a77965  # R-Car M3-N
+              - renesas,sdhi-r8a77970  # R-Car V3M
+              - renesas,sdhi-r8a77980  # R-Car V3H
+              - renesas,sdhi-r8a77990  # R-Car E3
+              - renesas,sdhi-r8a77995  # R-Car D3
+              - renesas,sdhi-r8a779a0  # R-Car V3U
+              - renesas,sdhi-r9a07g044 # RZ/G2{L,LC}
           - const: renesas,rcar-gen3-sdhi # R-Car Gen3 or RZ/G2
 
   reg:
@@ -66,15 +67,9 @@  properties:
     minItems: 1
     maxItems: 3
 
-  clocks:
-    minItems: 1
-    maxItems: 2
+  clocks: true
 
-  clock-names:
-    minItems: 1
-    items:
-      - const: core
-      - const: cd
+  clock-names: true
 
   dmas:
     minItems: 4
@@ -108,6 +103,42 @@  properties:
 allOf:
   - $ref: "mmc-controller.yaml"
 
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: renesas,sdhi-r9a07g044
+    then:
+      properties:
+        clocks:
+          items:
+            - description: IMCLK, SDHI channel main clock1.
+            - description: IMCLK2, SDHI channel main clock2. When this clock is
+                           turned off, external SD card detection cannot be
+                           detected.
+            - description: CLK_HS, SDHI channel High speed clock which operates
+                           4 times that of SDHI channel main clock1.
+            - description: ACLK, SDHI channel bus clock.
+        clock-names:
+          items:
+            - const: imclk
+            - const: imclk2
+            - const: clk_hs
+            - const: aclk
+      required:
+        - clock-names
+        - resets
+    else:
+      properties:
+        clocks:
+          minItems: 1
+          maxItems: 2
+        clock-names:
+          minItems: 1
+          items:
+            - const: core
+            - const: cd
+
   - if:
       properties:
         compatible: