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

Commit 743e3c8f 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 fix from Stephen Boyd:
 "One fix for the qcom QCS404 clk driver that was merged for this
  release.

  It specified the wrong parent for a PLL so a part of the clk tree
  wasn't rooted correctly. This fixes it by using the right name"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: qcom: qcs404: Fix gpll0_out_main parent
parents eb6cf9f8 8a034aad

drivers/clk/qcom/gcc-qcs404.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static struct clk_alpha_pll gpll0_out_main = { 
		.hw.init = &(struct clk_init_data){

			.name = "gpll0_out_main",

			.parent_names = (const char *[])

					{ "gpll0_sleep_clk_src" },

					{ "cxo" },

			.num_parents = 1,

			.ops = &clk_alpha_pll_ops,

		},