Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1aa42f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "A small set of fixes for clk drivers.

  One to fix a DT refcount imbalance, two to mark some Amlogic clks as
  critical, and one final one that fixes a clk name for the Qualcomm
  driver merged this cycle"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  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 ab6e1f37 1aefa98b

drivers/clk/clk-fixed-factor.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,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
@@ -506,6 +506,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/qcom/gcc-qcs404.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static struct clk_fixed_factor cxo = { 
	.div = 1,

	.hw.init = &(struct clk_init_data){

		.name = "cxo",

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

		.parent_names = (const char *[]){ "xo-board" },

		.num_parents = 1,

		.ops = &clk_fixed_factor_ops,

	},