Commit abe7e32f authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-ingenic', 'clk-vc5', 'clk-cleanup', 'clk-canaan' and... 

Merge branches 'clk-ingenic', 'clk-vc5', 'clk-cleanup', 'clk-canaan' and 'clk-marvell' into clk-next

 - Bindings for Canaan K210 SoC clks

* clk-ingenic:
  clk: ingenic: Fix divider calculation with div tables

* clk-vc5:
  clk: vc5: Use "idt,voltage-microvolt" instead of "idt,voltage-microvolts"

* clk-cleanup:
  clk: sunxi-ng: Make sure divider tables have sentinel
  clk: s2mps11: Fix a resource leak in error handling paths in the probe function
  clk: bcm: dvp: Add MODULE_DEVICE_TABLE()
  clk: bcm: dvp: drop a variable that is assigned to only

* clk-canaan:
  dt-binding: clock: Document canaan,k210-clk bindings
  dt-bindings: Add Canaan vendor prefix

* clk-marvell:
  clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9
parents b53a1603 11a163f2 4b003f5f 48f68de0 0c797d2c 6f37689c

Documentation/devicetree/bindings/clock/canaan,k210-clk.yaml

0 → 100644
+54 −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/canaan,k210-clk.yaml#

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



title: Canaan Kendryte K210 Clock Device Tree Bindings



maintainers:

  - Damien Le Moal <damien.lemoal@wdc.com>



description: |

  Canaan Kendryte K210 SoC clocks driver bindings. The clock

  controller node must be defined as a child node of the K210

  system controller node.



  See also:

  - dt-bindings/clock/k210-clk.h



properties:

  compatible:

    const: canaan,k210-clk



  clocks:

    description:

      Phandle of the SoC 26MHz fixed-rate oscillator clock.



  '#clock-cells':

    const: 1



required:

  - compatible

  - '#clock-cells'

  - clocks



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/k210-clk.h>

    clocks {

      in0: oscillator {

        compatible = "fixed-clock";

        #clock-cells = <0>;

        clock-frequency = <26000000>;

      };

    };



    /* ... */

    sysclk: clock-controller {

      #clock-cells = <1>;

      compatible = "canaan,k210-clk";

      clocks = <&in0>;

    };

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ patternProperties: 
    description: CALAO Systems SAS

  "^calxeda,.*":

    description: Calxeda

  "^canaan,.*":

    description: Canaan, Inc.

  "^caninos,.*":

    description: Caninos Loucos Program

  "^capella,.*":

drivers/clk/bcm/clk-bcm2711-dvp.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ static const struct clk_parent_data clk_dvp_parent = { 
static int clk_dvp_probe(struct platform_device *pdev)

{

	struct clk_hw_onecell_data *data;

	struct resource *res;

	struct clk_dvp *dvp;

	void __iomem *base;

	int ret;
@@ -42,7 +41,7 @@ static int clk_dvp_probe(struct platform_device *pdev) 
		return -ENOMEM;

	data = dvp->data;



	base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);
@@ -108,6 +107,7 @@ static const struct of_device_id clk_dvp_dt_ids[] = { 
	{ .compatible = "brcm,brcm2711-dvp", },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, clk_dvp_dt_ids);



static struct platform_driver clk_dvp_driver = {

	.probe	= clk_dvp_probe,

drivers/clk/clk-s2mps11.c

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) 
	return ret;



err_reg:

	of_node_put(s2mps11_clks[0].clk_np);

	while (--i >= 0)

		clkdev_drop(s2mps11_clks[i].lookup);

drivers/clk/clk-versaclock5.c

+2 −2
Original line number Diff line number Diff line
@@ -739,8 +739,8 @@ static int vc5_update_power(struct device_node *np_output, 
{

	u32 value;



	if (!of_property_read_u32(np_output,

				  "idt,voltage-microvolts", &value)) {

	if (!of_property_read_u32(np_output, "idt,voltage-microvolt",

				  &value)) {

		clk_out->clk_output_cfg0_mask |= VC5_CLK_OUTPUT_CFG0_PWR_MASK;

		switch (value) {

		case 1800000:

CRA Git | Maintained and supported by SUSTech CRA and CCSE