Unverified Commit 541b107c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-bindings-for-v5.17-tag1' of...

Merge tag 'renesas-dt-bindings-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas DT binding updates for v5.17

  - Document SDHI SDnH clocks on R-Car Gen2 and later,
  - Document core support for the R-Car S4-8 (R8A779F0) SoC.

* tag 'renesas-dt-bindings-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  dt-bindings: mmc: renesas,sdhi: Rename RZ/G2L clocks
  dt-bindings: power: renesas,rcar-sysc: Document r8a779f0 SYSC bindings
  dt-bindings: reset: renesas,rst: Document r8a779f0 reset module
  dt-bindings: arm: renesas: Document R-Car S4-8 SoC DT bindings
  dt-bindings: mmc: renesas,sdhi: Add optional SDnH clock

Link: https://lore.kernel.org/r/cover.1638530614.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ee58c0a4 217c7d18
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ properties:
          - const: renesas,falcon-cpu
          - const: renesas,r8a779a0

      - description: R-Car S4-8 (R8A779F0)
        items:
          - const: renesas,r8a779f0

      - description: R-Car H3e (R8A779M0)
        items:
          - enum:
+34 −14
Original line number Diff line number Diff line
@@ -113,21 +113,41 @@ allOf:
        clocks:
          items:
            - description: IMCLK, SDHI channel main clock1.
            - description: CLK_HS, SDHI channel High speed clock which operates
                           4 times that of 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: core
            - const: clkh
            - const: cd
            - const: aclk
      required:
        - clock-names
        - resets
    else:
      if:
        properties:
          compatible:
            contains:
              enum:
                - renesas,rcar-gen2-sdhi
                - renesas,rcar-gen3-sdhi
      then:
        properties:
          clocks:
            minItems: 1
            maxItems: 3
          clock-names:
            minItems: 1
            uniqueItems: true
            items:
              - const: core
              - enum: [ clkh, cd ]
              - const: cd
      else:
        properties:
          clocks:
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties:
      - renesas,r8a77990-sysc # R-Car E3
      - renesas,r8a77995-sysc # R-Car D3
      - renesas,r8a779a0-sysc # R-Car V3U
      - renesas,r8a779f0-sysc # R-Car S4-8

  reg:
    maxItems: 1
+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ properties:
      - renesas,r8a77990-rst      # R-Car E3
      - renesas,r8a77995-rst      # R-Car D3
      - renesas,r8a779a0-rst      # R-Car V3U
      - renesas,r8a779f0-rst      # R-Car S4-8

  reg:
    maxItems: 1