aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-14 15:14:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-14 15:14:41 -0500
commit743e3c8f19db951ce9d20e6accb290444f4737a4 (patch)
treeacf9419204e70dcb32f79930c9d60994aa80bc83
parenteb6cf9f8cb9dfacf6679f9d6c72aaf568a027edf (diff)
parent8a034aad4892baf82f8c9082f969c5ebc1143a05 (diff)
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
-rw-r--r--drivers/clk/qcom/gcc-qcs404.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index ef1b267cb058..64da032bb9ed 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -297,7 +297,7 @@ static struct clk_alpha_pll gpll0_out_main = {
297 .hw.init = &(struct clk_init_data){ 297 .hw.init = &(struct clk_init_data){
298 .name = "gpll0_out_main", 298 .name = "gpll0_out_main",
299 .parent_names = (const char *[]) 299 .parent_names = (const char *[])
300 { "gpll0_sleep_clk_src" }, 300 { "cxo" },
301 .num_parents = 1, 301 .num_parents = 1,
302 .ops = &clk_alpha_pll_ops, 302 .ops = &clk_alpha_pll_ops,
303 }, 303 },