diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-12-15 00:42:08 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-12-15 00:42:08 +0300 |
| commit | 9dc320424708378b7a2137a148fc4fc816105ba2 (patch) | |
| tree | 74fe6b0ceddc3b78682ba2a6d95975a61f735f2b /drivers/clk/qcom | |
| parent | 44a6951777a3c6bd6f934e23537c2965a0283985 (diff) | |
| parent | 8a034aad4892baf82f8c9082f969c5ebc1143a05 (diff) | |
| download | linux-9dc320424708378b7a2137a148fc4fc816105ba2.tar.xz | |
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
Diffstat (limited to 'drivers/clk/qcom')
| -rw-r--r-- | drivers/clk/qcom/gcc-qcs404.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c index e4ca6a45f313..64da032bb9ed 100644 --- a/drivers/clk/qcom/gcc-qcs404.c +++ b/drivers/clk/qcom/gcc-qcs404.c @@ -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, }, @@ -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, }, |