Unverified Commit 7459da16 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-bindings', 'clk-renesas', 'clk-spacemit' and 'clk-cleanup' into clk-next

* clk-bindings:
  dt-bindings: clock: Drop st,stm32h7-rcc.txt
  dt-bindings: clock: convert bcm2835-aux-clock to yaml
  dt-bindings: clock: Drop maxim,max77686.txt
  dt-bindings: clock: convert vf610-clock.txt to yaml format

* clk-renesas: (26 commits)
  clk: renesas: r9a09g047: Add XSPI clock/reset
  clk: renesas: r9a09g047: Add support for xspi mux and divider
  dt-bindings: clock: renesas,r9a09g047-cpg: Add XSPI and GBETH PTP core clocks
  clk: renesas: Use str_on_off() helper
  clk: renesas: r9a09g057: Add clock and reset entries for USB2
  dt-bindings: clock: renesas,r9a09g057-cpg: Add USB2 PHY and GBETH PTP core clocks
  clk: renesas: rzv2h: Use both CLK_ON and CLK_MON bits for clock state validation
  clk: renesas: rzv2h: Use str_on_off() helper in rzv2h_mod_clock_endisable()
  clk: renesas: rzv2h: Support static dividers without RMW
  clk: renesas: rzv2h: Add macro for defining static dividers
  clk: renesas: rzv2h: Add support for static mux clocks
  clk: renesas: r9a09g047: Add clock and reset entries for GE3D
  clk: renesas: rzv2h: Fix a typo
  clk: renesas: rzv2h: Add support for RZ/V2N SoC
  clk: renesas: rzv2h: Sort compatible list based on SoC part number
  dt-bindings: pinctrl: renesas: Document RZ/V2N SoC
  dt-bindings: clock: renesas: Document RZ/V2N SoC CPG
  dt-bindings: soc: renesas: Document SYS for RZ/V2N SoC
  dt-bindings: soc: renesas: Document Renesas RZ/V2N SoC variants and EVK
  clk: renesas: rzv2h: Simplify rzv2h_cpg_assert()/rzv2h_cpg_deassert()
  ...

* clk-spacemit:
  clk: spacemit: k1: Add TWSI8 bus and function clocks
  clk: spacemit: Add clock support for SpacemiT K1 SoC
  dt-bindings: clock: spacemit: Add spacemit,k1-pll
  dt-bindings: soc: spacemit: Add spacemit,k1-syscon

* clk-cleanup:
  clk: test: Forward-declare struct of_phandle_args in kunit/clk.h
  clk: davinci: Use of_get_available_child_by_name()
  clk: bcm: rpi: Add NULL check in raspberrypi_clk_register()
  clk: bcm: rpi: Drop module alias
  clk: bcm: kona: Remove unused scaled_div_build
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@
$id: http://devicetree.org/schemas/clock/renesas,rzv2h-cpg.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Renesas RZ/{G3E,V2H(P)} Clock Pulse Generator (CPG)
title: Renesas RZ/{G3E,V2H(P),V2N} Clock Pulse Generator (CPG)

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

description:
  On Renesas RZ/{G3E,V2H(P)} SoCs, the CPG (Clock Pulse Generator) handles
  On Renesas RZ/{G3E,V2H(P),V2N} SoCs, the CPG (Clock Pulse Generator) handles
  generation and control of clock signals for the IP modules, generation and
  control of resets, and control over booting, low power consumption and power
  supply domains.
@@ -19,6 +19,7 @@ properties:
  compatible:
    enum:
      - renesas,r9a09g047-cpg # RZ/G3E
      - renesas,r9a09g056-cpg # RZ/V2N
      - renesas,r9a09g057-cpg # RZ/V2H

  reg:
+50 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/clock/spacemit,k1-pll.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: SpacemiT K1 PLL

maintainers:
  - Haylen Chu <heylenay@4d2.org>

properties:
  compatible:
    const: spacemit,k1-pll

  reg:
    maxItems: 1

  clocks:
    description: External 24MHz oscillator

  spacemit,mpmu:
    $ref: /schemas/types.yaml#/definitions/phandle
    description:
      Phandle to the "Main PMU (MPMU)" syscon. It is used to check PLL
      lock status.

  "#clock-cells":
    const: 1
    description:
      See <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.

required:
  - compatible
  - reg
  - clocks
  - spacemit,mpmu
  - "#clock-cells"

additionalProperties: false

examples:
  - |
    clock-controller@d4090000 {
        compatible = "spacemit,k1-pll";
        reg = <0xd4090000 0x1000>;
        clocks = <&vctcxo_24m>;
        spacemit,mpmu = <&sysctl_mpmu>;
        #clock-cells = <1>;
    };
+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties:
              - renesas,r9a07g044-pinctrl # RZ/G2{L,LC}
              - renesas,r9a08g045-pinctrl # RZ/G3S
              - renesas,r9a09g047-pinctrl # RZ/G3E
              - renesas,r9a09g056-pinctrl # RZ/V2N
              - renesas,r9a09g057-pinctrl # RZ/V2H(P)

      - items:
@@ -145,6 +146,7 @@ allOf:
          contains:
            enum:
              - renesas,r9a09g047-pinctrl
              - renesas,r9a09g056-pinctrl
              - renesas,r9a09g057-pinctrl
    then:
      properties:
+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties:
    items:
      - enum:
          - renesas,r9a09g047-sys # RZ/G3E
          - renesas,r9a09g056-sys # RZ/V2N
          - renesas,r9a09g057-sys # RZ/V2H

  reg:
+15 −0
Original line number Diff line number Diff line
@@ -551,6 +551,21 @@ properties:
              - renesas,r9a09g047e58 # Quad Cortex-A55 + Cortex-M33 + Ethos-U55 (21mm BGA)
          - const: renesas,r9a09g047

      - description: RZ/V2N (R9A09G056)
        items:
          - enum:
              - renesas,rzv2n-evk # RZ/V2N EVK (RTK0EF0186C03000BJ)
          - enum:
              - renesas,r9a09g056n41 # RZ/V2N
              - renesas,r9a09g056n42 # RZ/V2N with Mali-G31 support
              - renesas,r9a09g056n43 # RZ/V2N with Mali-C55 support
              - renesas,r9a09g056n44 # RZ/V2N with Mali-G31 + Mali-C55 support
              - renesas,r9a09g056n45 # RZ/V2N with cryptographic extension support
              - renesas,r9a09g056n46 # RZ/V2N with Mali-G31 + cryptographic extension support
              - renesas,r9a09g056n47 # RZ/V2N with Mali-C55 + cryptographic extension support
              - renesas,r9a09g056n48 # RZ/V2N with Mali-G31 + Mali-C55 + cryptographic extension support
          - const: renesas,r9a09g056

      - description: RZ/V2H(P) (R9A09G057)
        items:
          - enum:
Loading