Unverified Commit 16c3c4e2 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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

* clk-renesas: (25 commits)
  dt-bindings: clk: rs9: Fix DIF pattern match
  clk: rs9: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  clk: rs9: Reserve 8 struct clk_hw slots for for 9FGV0841
  clk: renesas: Add missing log message terminators
  clk: renesas: rzg2l: Remove DSI clock rate restrictions
  clk: renesas: rzv2h: Deassert reset on assert timeout
  clk: renesas: rzg2l: Deassert reset on assert timeout
  clk: renesas: cpg-mssr: Unlock before reset verification
  clk: renesas: r9a09g056: Add entries for CANFD
  clk: renesas: r9a09g057: Add entries for CANFD
  clk: renesas: r9a09g077: Add CANFD clocks
  clk: renesas: cpg-mssr: Handle RZ/T2H register layout in PM callbacks
  dt-bindings: clock: renesas,r9a09g077/87: Add PCLKCAN ID
  clk: renesas: cpg-mssr: Simplify pointer math in cpg_rzt2h_mstp_read()
  clk: renesas: r9a09g056: Add clock and reset entries for TSU
  clk: renesas: r9a09g057: Add entries for RSCIs
  clk: renesas: r9a09g056: Add entries for RSCIs
  clk: renesas: r9a09g056: Add entries for the RSPIs
  clk: renesas: r9a09g056: Add entries for ICU
  clk: renesas: r9a09g056: Add entries for the DMACs
  ...

* clk-cleanup:
  clk: Disable KUNIT_UML_PCI
  clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc
  clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc
  clk: tegra: tegra124-emc: fix device leak on set_rate()
  clk: Annotate #else and #endif
  clk: Merge prepare and unprepare sections
  clk: Move clk_{save,restore}_context() to COMMON_CLK section
  clk: clk-apple-nco: Add "apple,t8103-nco" compatible
  clk: versatile: impd1: Simplify with scoped for each OF child loop
  clk: scpi: Simplify with scoped for each OF child loop
  clk: lmk04832: Simplify with scoped for each OF child loop

* clk-spacemit:
  clk: spacemit: k3: add the clock tree
  clk: spacemit: k3: extract common header
  clk: spacemit: ccu_pll: add plla type clock
  clk: spacemit: ccu_mix: add inverted enable gate clock
  dt-bindings: soc: spacemit: k3: add clock support
  clk: spacemit: add platform SoC prefix to reset name
  clk: spacemit: extract common ccu functions
  reset: spacemit: fix auxiliary device id
  clk: spacemit: prepare common ccu header
  clk: spacemit: Hide common clock driver from user controller
  clk: spacemit: Respect Kconfig setting when building modules

* clk-tegra:
  clk: tegra30: Add CSI pad clock gates
  clk: tegra: Set CSUS as vi_sensor's gate for Tegra20, Tegra30 and Tegra114
  clk: tegra20: Reparent dsi clock to pll_d_out0
  clk: tegra: tegra124-emc: Simplify with scoped for each OF child loop
  clk: tegra: Adjust callbacks in tegra_clock_pm
  clk: tegra: tegra124-emc: Fix potential memory leak in tegra124_clk_register_emc()
parents 341d72eb b079e4e6 6294bb8e 2d4235b1

Documentation/devicetree/bindings/clock/spacemit,k1-pll.yaml

+6 −3
Original line number Diff line number Diff line
@@ -4,14 +4,16 @@ 
$id: http://devicetree.org/schemas/clock/spacemit,k1-pll.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: SpacemiT K1 PLL

title: SpacemiT K1/K3 PLL



maintainers:

  - Haylen Chu <heylenay@4d2.org>



properties:

  compatible:

    const: spacemit,k1-pll

    enum:

      - spacemit,k1-pll

      - spacemit,k3-pll



  reg:

    maxItems: 1
@@ -28,7 +30,8 @@ properties: 
  "#clock-cells":

    const: 1

    description:

      See <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.

      For K1 SoC, check <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.

      For K3 SoC, check <dt-bindings/clock/spacemit,k3-clocks.h> for valid indices.



required:

  - compatible

Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml

+12 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$id: http://devicetree.org/schemas/soc/spacemit/spacemit,k1-syscon.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: SpacemiT K1 SoC System Controller

title: SpacemiT K1/K3 SoC System Controller



maintainers:

  - Haylen Chu <heylenay@4d2.org>
@@ -22,6 +22,10 @@ properties: 
      - spacemit,k1-syscon-rcpu

      - spacemit,k1-syscon-rcpu2

      - spacemit,k1-syscon-apbc2

      - spacemit,k3-syscon-apbc

      - spacemit,k3-syscon-apmu

      - spacemit,k3-syscon-dciu

      - spacemit,k3-syscon-mpmu



  reg:

    maxItems: 1
@@ -39,7 +43,8 @@ properties: 
  "#clock-cells":

    const: 1

    description:

      See <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.

      For K1 SoC, check <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.

      For K3 SoC, check <dt-bindings/clock/spacemit,k3-clocks.h> for valid indices.



  "#power-domain-cells":

    const: 1
@@ -60,6 +65,8 @@ allOf: 
            enum:

              - spacemit,k1-syscon-apmu

              - spacemit,k1-syscon-mpmu

              - spacemit,k3-syscon-apmu

              - spacemit,k3-syscon-mpmu

    then:

      required:

        - "#power-domain-cells"
@@ -74,6 +81,9 @@ allOf: 
              - spacemit,k1-syscon-apbc

              - spacemit,k1-syscon-apmu

              - spacemit,k1-syscon-mpmu

              - spacemit,k3-syscon-apbc

              - spacemit,k3-syscon-apmu

              - spacemit,k3-syscon-mpmu

    then:

      required:

        - clocks

drivers/clk/.kunitconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_KUNIT=y

CONFIG_KUNIT_UML_PCI=n

CONFIG_OF=y

CONFIG_OF_OVERLAY=y

CONFIG_COMMON_CLK=y
@@ -6,4 +7,3 @@ CONFIG_CLK_KUNIT_TEST=y 
CONFIG_CLK_FIXED_RATE_KUNIT_TEST=y

CONFIG_CLK_GATE_KUNIT_TEST=y

CONFIG_CLK_FD_KUNIT_TEST=y
 
CONFIG_UML_PCI_OVER_VIRTIO=n

drivers/clk/clk-apple-nco.c

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ static int applnco_probe(struct platform_device *pdev) 
}



static const struct of_device_id applnco_ids[] = {

	{ .compatible = "apple,t8103-nco" },

	{ .compatible = "apple,nco" },

	{ }

};

drivers/clk/clk-lmk04832.c

+1 −3
Original line number Diff line number Diff line
@@ -1400,7 +1400,6 @@ static int lmk04832_probe(struct spi_device *spi) 
{

	const struct lmk04832_device_info *info;

	int rdbk_pin = RDBK_CLKIN_SEL1;

	struct device_node *child;

	struct lmk04832 *lmk;

	u8 tmp[3];

	int ret;
@@ -1462,14 +1461,13 @@ static int lmk04832_probe(struct spi_device *spi) 
	device_property_read_u32(lmk->dev, "ti,sysref-pulse-count",

				 &lmk->sysref_pulse_cnt);



	for_each_child_of_node(lmk->dev->of_node, child) {

	for_each_child_of_node_scoped(lmk->dev->of_node, child) {

		int reg;



		ret = of_property_read_u32(child, "reg", &reg);

		if (ret) {

			dev_err(lmk->dev, "missing reg property in child: %s\n",

				child->full_name);

			of_node_put(child);

			return ret;

		}