projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[linux-2.6-microblaze.git]
/
drivers
/
clk
/
qcom
/
gcc-sdm845.c
diff --git
a/drivers/clk/qcom/gcc-sdm845.c
b/drivers/clk/qcom/gcc-sdm845.c
index
c782e62
..
58fa5c2
100644
(file)
--- a/
drivers/clk/qcom/gcc-sdm845.c
+++ b/
drivers/clk/qcom/gcc-sdm845.c
@@
-115,8
+115,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[] = {
- "bi_tcxo",
+static const char * const gcc_parent_names_7
_ao
[] = {
+ "bi_tcxo
_ao
",
"gpll0",
"gpll0_out_even",
"core_bi_pll_test_se",
"gpll0",
"gpll0_out_even",
"core_bi_pll_test_se",
@@
-128,6
+128,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[] = {
{ P_BI_TCXO, 0 },
{ P_GPLL0_OUT_MAIN, 1 },
static const struct parent_map gcc_parent_map_10[] = {
{ P_BI_TCXO, 0 },
{ P_GPLL0_OUT_MAIN, 1 },
@@
-210,7
+216,7
@@
static struct clk_rcg2 gcc_cpuss_ahb_clk_src = {
.freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_ahb_clk_src",
.freq_tbl = ftbl_gcc_cpuss_ahb_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_ahb_clk_src",
- .parent_names = gcc_parent_names_7,
+ .parent_names = gcc_parent_names_7
_ao
,
.num_parents = 4,
.ops = &clk_rcg2_ops,
},
.num_parents = 4,
.ops = &clk_rcg2_ops,
},
@@
-229,7
+235,7
@@
static struct clk_rcg2 gcc_cpuss_rbcpr_clk_src = {
.freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_rbcpr_clk_src",
.freq_tbl = ftbl_gcc_cpuss_rbcpr_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "gcc_cpuss_rbcpr_clk_src",
- .parent_names = gcc_parent_names_8,
+ .parent_names = gcc_parent_names_8
_ao
,
.num_parents = 3,
.ops = &clk_rcg2_ops,
},
.num_parents = 3,
.ops = &clk_rcg2_ops,
},