Commit aad4dc74 authored by Taniya Das's avatar Taniya Das Committed by Greg Kroah-Hartman

clk: qcom: gcc: Use active only source for CPUSS clocks

[ Upstream commit 9ff1a3b4 ]

The clocks of the CPUSS such as "gcc_cpuss_ahb_clk_src" is a CRITICAL
clock and needs to vote on the active only source of XO, so as to keep
the vote as long as CPUSS is active. Similar rbcpr_clk_src is also has
the same requirement.
Signed-off-by: default avatarTaniya Das <tdas@codeaurora.org>
Fixes: 06391edd ("clk: qcom: Add Global Clock controller (GCC) driver for SDM845")
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cf872189
...@@ -131,8 +131,8 @@ static const char * const gcc_parent_names_6[] = { ...@@ -131,8 +131,8 @@ static const char * const gcc_parent_names_6[] = {
"core_bi_pll_test_se", "core_bi_pll_test_se",
}; };
static const char * const gcc_parent_names_7[] = { static const char * const gcc_parent_names_7_ao[] = {
"bi_tcxo", "bi_tcxo_ao",
"gpll0", "gpll0",
"gpll0_out_even", "gpll0_out_even",
"core_bi_pll_test_se", "core_bi_pll_test_se",
...@@ -144,6 +144,12 @@ static const char * const gcc_parent_names_8[] = { ...@@ -144,6 +144,12 @@ static const char * const gcc_parent_names_8[] = {
"core_bi_pll_test_se", "core_bi_pll_test_se",
}; };
static const char * const gcc_parent_names_8_ao[] = {
"bi_tcxo_ao",
"gpll0",
"core_bi_pll_test_se",
};
static const struct parent_map gcc_parent_map_10[] = { static const struct parent_map gcc_parent_map_10[] = {
{ P_BI_TCXO, 0 }, { P_BI_TCXO, 0 },
{ P_GPLL0_OUT_MAIN, 1 }, { P_GPLL0_OUT_MAIN, 1 },
...@@ -226,7 +232,7 @@ static struct clk_rcg2 gcc_cpuss_ahb_clk_src = { ...@@ -226,7 +232,7 @@ static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
.freq_tbl = ftbl_gcc_cpuss_ahb_clk_src, .freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_ahb_clk_src", .name = "gcc_cpuss_ahb_clk_src",
.parent_names = gcc_parent_names_7, .parent_names = gcc_parent_names_7_ao,
.num_parents = 4, .num_parents = 4,
.ops = &clk_rcg2_ops, .ops = &clk_rcg2_ops,
}, },
...@@ -245,7 +251,7 @@ static struct clk_rcg2 gcc_cpuss_rbcpr_clk_src = { ...@@ -245,7 +251,7 @@ static struct clk_rcg2 gcc_cpuss_rbcpr_clk_src = {
.freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src, .freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_rbcpr_clk_src", .name = "gcc_cpuss_rbcpr_clk_src",
.parent_names = gcc_parent_names_8, .parent_names = gcc_parent_names_8_ao,
.num_parents = 3, .num_parents = 3,
.ops = &clk_rcg2_ops, .ops = &clk_rcg2_ops,
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment