mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

clk: qcom: lcc-msm8960: use parent_hws/_data instead of parent_names

Browse source 
Convert the clock driver to specify parent data rather than parent
names, to actually bind using 'clock-names' specified in the DTS rather
than global clock names. Use parent_hws where possible to refer parent
clocks directly, skipping the lookup.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: David Heidelberg <david@ixit.cz> # tested on Nexus 7 (2013)
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220623120418.250589-7-dmitry.baryshkov@linaro.org
This commit is contained in:
Dmitry Baryshkov 2022-06-23 15:04:09 +03:00 committed by Bjorn Andersson
parent 7026af10aa
commit a6976f8526
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
drivers/clk/qcom/lcc-msm8960.c
View file

@ -33,7 +33,9 @@ static struct clk_pll pll4 = {
.status_bit = 16, .status_bit = 16,
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pll4", .name = "pll4",
.parent_names = (const char *[]){ "pxo" }, .parent_data = (const struct clk_parent_data[]){
{ .fw_name = "pxo", .name = "pxo_board" },
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_pll_ops, .ops = &clk_pll_ops,
}, },
@ -49,9 +51,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = {
{ P_PLL4, 2 } { P_PLL4, 2 }
}; };
static const char * const lcc_pxo_pll4[] = { static const struct clk_parent_data lcc_pxo_pll4[] = {
"pxo", { .fw_name = "pxo", .name = "pxo_board" },
"pll4_vote", { .fw_name = "pll4_vote", .name = "pll4_vote" },
}; };
static struct freq_tbl clk_tbl_aif_osr_492[] = { static struct freq_tbl clk_tbl_aif_osr_492[] = {
@ -112,17 +114,13 @@ static struct clk_rcg prefix##_osr_src = { \
.enable_mask = BIT(9), \ .enable_mask = BIT(9), \
.hw.init = &(struct clk_init_data){ \ .hw.init = &(struct clk_init_data){ \
.name = #prefix "_osr_src", \ .name = #prefix "_osr_src", \
.parent_names = lcc_pxo_pll4, \ .parent_data = lcc_pxo_pll4, \
.num_parents = 2, \ .num_parents = ARRAY_SIZE(lcc_pxo_pll4), \
.ops = &clk_rcg_ops, \ .ops = &clk_rcg_ops, \
.flags = CLK_SET_RATE_GATE, \ .flags = CLK_SET_RATE_GATE, \
}, \ }, \
}, \ }, \
}; \ }; \
\
static const char * const lcc_##prefix##_parents[] = { \
#prefix "_osr_src", \
}; \
#define CLK_AIF_OSR_CLK(prefix, _ns, hr, en_bit) \ #define CLK_AIF_OSR_CLK(prefix, _ns, hr, en_bit) \
static struct clk_branch prefix##_osr_clk = { \ static struct clk_branch prefix##_osr_clk = { \
@ -134,7 +132,9 @@ static struct clk_branch prefix##_osr_clk = { \
.enable_mask = BIT(en_bit), \ .enable_mask = BIT(en_bit), \
.hw.init = &(struct clk_init_data){ \ .hw.init = &(struct clk_init_data){ \
.name = #prefix "_osr_clk", \ .name = #prefix "_osr_clk", \
.parent_names = lcc_##prefix##_parents, \ .parent_hws = (const struct clk_hw*[]){ \
&prefix##_osr_src.clkr.hw, \
}, \
.num_parents = 1, \ .num_parents = 1, \
.ops = &clk_branch_ops, \ .ops = &clk_branch_ops, \
.flags = CLK_SET_RATE_PARENT, \ .flags = CLK_SET_RATE_PARENT, \
@ -150,7 +150,9 @@ static struct clk_regmap_div prefix##_div_clk = { \
.clkr = { \ .clkr = { \
.hw.init = &(struct clk_init_data){ \ .hw.init = &(struct clk_init_data){ \
.name = #prefix "_div_clk", \ .name = #prefix "_div_clk", \
.parent_names = lcc_##prefix##_parents, \ .parent_hws = (const struct clk_hw*[]){ \
&prefix##_osr_src.clkr.hw, \
}, \
.num_parents = 1, \ .num_parents = 1, \
.ops = &clk_regmap_div_ops, \ .ops = &clk_regmap_div_ops, \
}, \ }, \
@ -167,9 +169,9 @@ static struct clk_branch prefix##_bit_div_clk = { \
.enable_mask = BIT(en_bit), \ .enable_mask = BIT(en_bit), \
.hw.init = &(struct clk_init_data){ \ .hw.init = &(struct clk_init_data){ \
.name = #prefix "_bit_div_clk", \ .name = #prefix "_bit_div_clk", \
.parent_names = (const char *[]){ \ .parent_hws = (const struct clk_hw*[]){ \
#prefix "_div_clk" \ &prefix##_div_clk.clkr.hw, \
}, \ }, \
.num_parents = 1, \ .num_parents = 1, \
.ops = &clk_branch_ops, \ .ops = &clk_branch_ops, \
.flags = CLK_SET_RATE_PARENT, \ .flags = CLK_SET_RATE_PARENT, \
@ -185,9 +187,10 @@ static struct clk_regmap_mux prefix##_bit_clk = { \
.clkr = { \ .clkr = { \
.hw.init = &(struct clk_init_data){ \ .hw.init = &(struct clk_init_data){ \
.name = #prefix "_bit_clk", \ .name = #prefix "_bit_clk", \
.parent_names = (const char *[]){ \ .parent_data = (const struct clk_parent_data[]){ \
#prefix "_bit_div_clk", \ { .hw = &prefix##_bit_div_clk.clkr.hw, }, \
#prefix "_codec_clk", \ { .fw_name = #prefix "_codec_clk", \
.name = #prefix "_codec_clk", }, \
}, \ }, \
.num_parents = 2, \ .num_parents = 2, \
.ops = &clk_regmap_mux_closest_ops, \ .ops = &clk_regmap_mux_closest_ops, \
@ -273,8 +276,8 @@ static struct clk_rcg pcm_src = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcm_src", .name = "pcm_src",
.parent_names = lcc_pxo_pll4, .parent_data = lcc_pxo_pll4,
.num_parents = 2, .num_parents = ARRAY_SIZE(lcc_pxo_pll4),
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
}, },
@ -290,7 +293,9 @@ static struct clk_branch pcm_clk_out = {
.enable_mask = BIT(11), .enable_mask = BIT(11),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcm_clk_out", .name = "pcm_clk_out",
.parent_names = (const char *[]){ "pcm_src" }, .parent_hws = (const struct clk_hw*[]){
&pcm_src.clkr.hw
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
@ -305,9 +310,9 @@ static struct clk_regmap_mux pcm_clk = {
.clkr = { .clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "pcm_clk", .name = "pcm_clk",
.parent_names = (const char *[]){ .parent_data = (const struct clk_parent_data[]){
"pcm_clk_out", { .hw = &pcm_clk_out.clkr.hw },
"pcm_codec_clk", { .fw_name = "pcm_codec_clk", .name = "pcm_codec_clk" },
}, },
.num_parents = 2, .num_parents = 2,
.ops = &clk_regmap_mux_closest_ops, .ops = &clk_regmap_mux_closest_ops,
@ -341,18 +346,14 @@ static struct clk_rcg slimbus_src = {
.enable_mask = BIT(9), .enable_mask = BIT(9),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "slimbus_src", .name = "slimbus_src",
.parent_names = lcc_pxo_pll4, .parent_data = lcc_pxo_pll4,
.num_parents = 2, .num_parents = ARRAY_SIZE(lcc_pxo_pll4),
.ops = &clk_rcg_ops, .ops = &clk_rcg_ops,
.flags = CLK_SET_RATE_GATE, .flags = CLK_SET_RATE_GATE,
}, },
}, },
}; };
static const char * const lcc_slimbus_parents[] = {
"slimbus_src",
};
static struct clk_branch audio_slimbus_clk = { static struct clk_branch audio_slimbus_clk = {
.halt_reg = 0xd4, .halt_reg = 0xd4,
.halt_bit = 0, .halt_bit = 0,
@ -362,7 +363,9 @@ static struct clk_branch audio_slimbus_clk = {
.enable_mask = BIT(10), .enable_mask = BIT(10),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "audio_slimbus_clk", .name = "audio_slimbus_clk",
.parent_names = lcc_slimbus_parents, .parent_hws = (const struct clk_hw*[]){
&slimbus_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
@ -379,7 +382,9 @@ static struct clk_branch sps_slimbus_clk = {
.enable_mask = BIT(12), .enable_mask = BIT(12),
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "sps_slimbus_clk", .name = "sps_slimbus_clk",
.parent_names = lcc_slimbus_parents, .parent_hws = (const struct clk_hw*[]){
&slimbus_src.clkr.hw,
},
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,