Commit 9dc32042 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: qcom: qcs404: Fix gpll0_out_main parent
  clk: zynqmp: Off by one in zynqmp_is_valid_clock()
  clk: mmp: Off by one in mmp_clk_add()
  clk: mvebu: Off by one bugs in cp110_of_clk_get()
  arm64: dts: qcom: sdm845-mtp: Mark protected gcc clocks
  clk: zynqmp: handle fixed factor param query error
  clk: qcom: gcc: Fix board clock node name
  clk: meson: axg: mark fdiv2 and fdiv3 as critical
  clk: meson-gxbb: set fclk_div3 as CLK_IS_CRITICAL
  clk: fixed-factor: fix of_node_get-put imbalance
parents 44a69517 8a034aad

arch/arm64/boot/dts/qcom/sdm845-mtp.dts

+6 −0
Original line number Diff line number Diff line
@@ -343,6 +343,12 @@ 
	};

};



&gcc {

	protected-clocks = <GCC_QSPI_CORE_CLK>,

			   <GCC_QSPI_CORE_CLK_SRC>,

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

};



&i2c10 {

	status = "okay";

	clock-frequency = <400000>;

drivers/clk/clk-fixed-factor.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static int of_fixed_factor_clk_remove(struct platform_device *pdev) 
{

	struct clk *clk = platform_get_drvdata(pdev);



	of_clk_del_provider(pdev->dev.of_node);

	clk_unregister_fixed_factor(clk);



	return 0;

drivers/clk/meson/axg.c

+13 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static struct clk_regmap axg_fclk_div2 = { 
		.ops = &clk_regmap_gate_ops,

		.parent_names = (const char *[]){ "fclk_div2_div" },

		.num_parents = 1,

		.flags = CLK_IS_CRITICAL,

	},

};
@@ -349,6 +350,18 @@ static struct clk_regmap axg_fclk_div3 = { 
		.ops = &clk_regmap_gate_ops,

		.parent_names = (const char *[]){ "fclk_div3_div" },

		.num_parents = 1,

		/*

		 * FIXME:

		 * This clock, as fdiv2, is used by the SCPI FW and is required

		 * by the platform to operate correctly.

		 * Until the following condition are met, we need this clock to

		 * be marked as critical:

		 * a) The SCPI generic driver claims and enable all the clocks

		 *    it needs

		 * b) CCF has a clock hand-off mechanism to make the sure the

		 *    clock stays on until the proper driver comes along

		 */

		.flags = CLK_IS_CRITICAL,

	},

};

drivers/clk/meson/gxbb.c

+12 −0
Original line number Diff line number Diff line
@@ -558,6 +558,18 @@ static struct clk_regmap gxbb_fclk_div3 = { 
		.ops = &clk_regmap_gate_ops,

		.parent_names = (const char *[]){ "fclk_div3_div" },

		.num_parents = 1,

		/*

		 * FIXME:

		 * This clock, as fdiv2, is used by the SCPI FW and is required

		 * by the platform to operate correctly.

		 * Until the following condition are met, we need this clock to

		 * be marked as critical:

		 * a) The SCPI generic driver claims and enable all the clocks

		 *    it needs

		 * b) CCF has a clock hand-off mechanism to make the sure the

		 *    clock stays on until the proper driver comes along

		 */

		.flags = CLK_IS_CRITICAL,

	},

};

drivers/clk/mmp/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id, 
		pr_err("CLK %d has invalid pointer %p\n", id, clk);

		return;

	}

	if (id > unit->nr_clks) {

	if (id >= unit->nr_clks) {

		pr_err("CLK %d is invalid\n", id);

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE