Skip to content

Commit 170ee4d

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Two fixes for the new SM8150 and SM8250 Qualcomm clk drivers to fix a randconfig build error and an incorrect parent mapping" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: qcom: gcc: Fix parent for gpll0_out_even clk: qcom: sm8250 gcc depends on QCOM_GDSC
2 parents 86e43b8 + a76f274 commit 170ee4d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/clk/qcom/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ config SM_GCC_8150
377377

378378
config SM_GCC_8250
379379
tristate "SM8250 Global Clock Controller"
380+
select QCOM_GDSC
380381
help
381382
Support for the global clock controller on SM8250 devices.
382383
Say Y if you want to use peripheral devices such as UART,

drivers/clk/qcom/gcc-sm8150.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_even = {
7676
.clkr.hw.init = &(struct clk_init_data){
7777
.name = "gpll0_out_even",
7878
.parent_data = &(const struct clk_parent_data){
79-
.fw_name = "bi_tcxo",
80-
.name = "bi_tcxo",
79+
.hw = &gpll0.clkr.hw,
8180
},
8281
.num_parents = 1,
8382
.ops = &clk_trion_pll_postdiv_ops,

0 commit comments

Comments
 (0)