dt-bindings: clock: add pcm reset for ipq806x lcc
PATCH v5 1/3 dt-bindings: clock: add pcm reset for ipq806x lcc
Add pcm reset define for ipq806x lcc.
---
v3:
- Added review tag
- Added ack tag
v2:
- Fix Sob tag
include/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 ++ 1 file changed, 2 insertions(+)
include/dt-bindings/clock/qcom,lcc-ipq806x.h +2 -0
@@ -19,4 +19,6 @@#define SPDIF_CLK 10#define AHBIX_CLK 11 +#define LCC_PCM_RESET 0 +#endif
Signature · 1 line
2.36.1
PATCH v5 2/3 clk: qcom: lcc-ipq806x: add reset definition
Add reset definition for lcc-ipq806x.
---
v3:
- Added review tag
v2:
- Fix Sob tag
drivers/clk/qcom/lcc-ipq806x.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/clk/qcom/lcc-ipq806x.c +7 -0
@@ -22,6 +22,7 @@#include "clk-branch.h" #include "clk-regmap-divider.h" #include "clk-regmap-mux.h" +#include "reset.h" static struct clk_pll pll4 = { .l_reg =0x4 ,
@@ -405,6 +406,10 @@ static struct clk_regmap *lcc_ipq806x_clks[] = { [AHBIX_CLK] = &ahbix_clk.clkr, }; +static const struct qcom_reset_map lcc_ipq806x_resets[] = { + [LCC_PCM_RESET ] = {0x54 ,13 }, +}; +static const struct regmap_config lcc_ipq806x_regmap_config = { .reg_bits =32 , .reg_stride =4 ,
@@ -417,6 +422,8 @@ static const struct qcom_cc_desc lcc_ipq806x_desc = { .config = &lcc_ipq806x_regmap_config, .clks = lcc_ipq806x_clks, .num_clks = ARRAY_SIZE(lcc_ipq806x_clks), + .resets = lcc_ipq806x_resets, + .num_resets = ARRAY_SIZE(lcc_ipq806x_resets), };static const struct of_device_id lcc_ipq806x_match_table[] = {
Signature · 1 line
2.36.1
PATCH v5 3/3 clk: qcom: lcc-ipq806x: convert to parent data
In reply to Christian MarangiConvert lcc-ipq806x driver to parent_data API.
---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo to pxo_board
drivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)
drivers/clk/qcom/lcc-ipq806x.c +42 -35
@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" , + }, .num_parents =1 , .ops = &clk_pll_ops, },
@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } }; -static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" }, };static struct freq_tbl clk_tbl_aif_mi2s[] = {
@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_mi2s_parents[] = { -"mi2s_osr_src" , -}; -static struct clk_branch mi2s_osr_clk = { .halt_reg =0x50 , .halt_bit =1 ,
@@ -152,7 +150,9 @@ static struct clk_branch mi2s_osr_clk = { .enable_mask = BIT(17), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
@@ -167,7 +167,9 @@ static struct clk_regmap_div mi2s_div_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="mi2s_div_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_regmap_div_ops, },
@@ -183,7 +185,9 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_div_clk" , - .parent_names = (const char *[]){"mi2s_div_clk" }, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_div_clk.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
@@ -191,6 +195,10 @@ static struct clk_branch mi2s_bit_div_clk = { }, }; +static const struct clk_parent_data lcc_mi2s_bit_div_codec_clk[] = { + { .hw = &mi2s_bit_div_clk.clkr.hw, }, + { .fw_name ="mi2s_codec_clk" , .name ="mi2s_codec_clk" }, +};static struct clk_regmap_mux mi2s_bit_clk = { .reg =0x48 ,
@@ -199,11 +207,8 @@ static struct clk_regmap_mux mi2s_bit_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_clk" , - .parent_names = (const char *[]){ -"mi2s_bit_div_clk" , -"mi2s_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_mi2s_bit_div_codec_clk, + .num_parents =ARRAY_SIZE (lcc_mi2s_bit_div_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },
@@ -245,8 +250,8 @@ static struct clk_rcg pcm_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="pcm_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , },
@@ -262,7 +267,9 @@ static struct clk_branch pcm_clk_out = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="pcm_clk_out" , - .parent_names = (const char *[]){"pcm_src" }, + .parent_hws = (const struct clk_hw *[]){ + &pcm_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
@@ -270,6 +277,11 @@ static struct clk_branch pcm_clk_out = { }, }; +static const struct clk_parent_data lcc_pcm_clk_out_codec_clk[] = { + { .hw = &pcm_clk_out.clkr.hw, }, + { .fw_name ="pcm_codec_clk" , .name ="pcm_codec_clk" }, +}; +static struct clk_regmap_mux pcm_clk = { .reg =0x54 , .shift =10 ,
@@ -277,11 +289,8 @@ static struct clk_regmap_mux pcm_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="pcm_clk" , - .parent_names = (const char *[]){ -"pcm_clk_out" , -"pcm_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_pcm_clk_out_codec_clk, + .num_parents =ARRAY_SIZE (lcc_pcm_clk_out_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },
@@ -325,18 +334,14 @@ static struct clk_rcg spdif_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="spdif_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_spdif_parents[] = { -"spdif_src" , -}; -static struct clk_branch spdif_clk = { .halt_reg =0xd4 , .halt_bit =1 ,
@@ -346,7 +351,9 @@ static struct clk_branch spdif_clk = { .enable_mask = BIT(12), .hw.init = &(struct clk_init_data ){ .name ="spdif_clk" , - .parent_names = lcc_spdif_parents, + .parent_hws = (const struct clk_hw *[]){ + &spdif_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
@@ -384,8 +391,8 @@ static struct clk_rcg ahbix_clk = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="ahbix" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_lcc_ops, }, },
Signature · 1 line
2.36.1
Re: [PATCH v5 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 21 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo topxo_boarddrivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0
drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 38
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-1@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" ,
This changes the behavior from looking for the globally named "pxo" to look for the globally named "pxo_board", in the event that no clock-names of "pxo" was found (based on the .fw_name).
So you probably want to keep this as .fw_name = "pxo", .name = "pxo".
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-0+ }, .num_parents = 1, .ops = &clk_pll_ops, },
drivers/clk/qcom/lcc-ipq806x.c static const struct parent_map lcc_pxo_pll4_map[] = { · line 71
Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-3@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } }; -static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" },
This is a reference to a clock defined in this same driver, so you can use { .hw = &pll4_vote.clkr.hw } to avoid the lookup all together.
Quoted 36 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-7};static struct freq_tbl clk_tbl_aif_mi2s[] = {@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_mi2s_parents[] = { -"mi2s_osr_src" , -}; -static struct clk_branch mi2s_osr_clk = { .halt_reg =0x50 , .halt_bit =1 ,@@ -152,7 +150,9 @@ static struct clk_branch mi2s_osr_clk = { .enable_mask = BIT(17), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
drivers/clk/qcom/lcc-ipq806x.c static struct clk_regmap_div mi2s_div_clk = { · line 170
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-1@@ -167,7 +167,9 @@ static struct clk_regmap_div mi2s_div_clk = { .clkr = { .hw.init = &(struct clk_init_data){ .name = "mi2s_div_clk", - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw*[]){
It would be wonderful if you could keep a space between ) and { in these.
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-1+ &mi2s_osr_src.clkr.hw, + }, .num_parents = 1, .ops = &clk_regmap_div_ops, },@@ -183,7 +185,9 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_div_clk" , - .parent_names = (const char *[]){"mi2s_div_clk" }, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_div_clk.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,
drivers/clk/qcom/lcc-ipq806x.c static struct clk_branch mi2s_bit_div_clk = { · line 200
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-0@@ -191,6 +195,10 @@ static struct clk_branch mi2s_bit_div_clk = { }, }; +static const struct clk_parent_data lcc_mi2s_bit_div_codec_clk[] = { + { .hw = &mi2s_bit_div_clk.clkr.hw, }, + { .fw_name ="mi2s_codec_clk" , .name ="mi2s_codec_clk" },
Is mi2s_codec_clk and external clock? I don't see it documented in the DT binding. And if we're introducing new clock-names, perhaps we could skip the _clk suffix - because obviously it's a clock :)
Regards,
Bjorn
Quoted 112 lines
drivers/clk/qcom/lcc-ipq806x.c +22
-22+};static struct clk_regmap_mux mi2s_bit_clk = { .reg =0x48 ,@@ -199,11 +207,8 @@ static struct clk_regmap_mux mi2s_bit_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_clk" , - .parent_names = (const char *[]){ -"mi2s_bit_div_clk" , -"mi2s_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_mi2s_bit_div_codec_clk, + .num_parents =ARRAY_SIZE (lcc_mi2s_bit_div_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -245,8 +250,8 @@ static struct clk_rcg pcm_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="pcm_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , },@@ -262,7 +267,9 @@ static struct clk_branch pcm_clk_out = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="pcm_clk_out" , - .parent_names = (const char *[]){"pcm_src" }, + .parent_hws = (const struct clk_hw *[]){ + &pcm_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -270,6 +277,11 @@ static struct clk_branch pcm_clk_out = { }, }; +static const struct clk_parent_data lcc_pcm_clk_out_codec_clk[] = { + { .hw = &pcm_clk_out.clkr.hw, }, + { .fw_name ="pcm_codec_clk" , .name ="pcm_codec_clk" }, +}; +static struct clk_regmap_mux pcm_clk = { .reg =0x54 , .shift =10 ,@@ -277,11 +289,8 @@ static struct clk_regmap_mux pcm_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="pcm_clk" , - .parent_names = (const char *[]){ -"pcm_clk_out" , -"pcm_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_pcm_clk_out_codec_clk, + .num_parents =ARRAY_SIZE (lcc_pcm_clk_out_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -325,18 +334,14 @@ static struct clk_rcg spdif_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="spdif_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_spdif_parents[] = { -"spdif_src" , -}; -static struct clk_branch spdif_clk = { .halt_reg =0xd4 , .halt_bit =1 ,@@ -346,7 +351,9 @@ static struct clk_branch spdif_clk = { .enable_mask = BIT(12), .hw.init = &(struct clk_init_data ){ .name ="spdif_clk" , - .parent_names = lcc_spdif_parents, + .parent_hws = (const struct clk_hw *[]){ + &spdif_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -384,8 +391,8 @@ static struct clk_rcg ahbix_clk = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="ahbix" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_lcc_ops, }, },Signature · 1 line
2.36.1
Re: [PATCH v5 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 34 lines · Bjorn Andersson
Quoted 21 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo topxo_boarddrivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 38
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-1@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" ,This changes the behavior from looking for the globally named "pxo" to look for the globally named "
pxo_board", in the event that no clock-names of "pxo" was found (based on the .fw_name).
Quoted 2 lines
So you probably want to keep this as .fw_name = "pxo", .name = "pxo".
Hi,
I will make this change but just for reference, I could be wrong by Dimitry pointed out that the pattern is .fw_name pxo .name pxo_board. The original patch had both set to pxo and it was asked to be changed.
Quoted 8 lines
Quoted 8 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-0+ }, .num_parents = 1, .ops = &clk_pll_ops, },@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } };
Quoted 10 lines
drivers/clk/qcom/lcc-ipq806x.c static const struct parent_map lcc_pxo_pll4_map[] = { · line 71
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-3-static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" },This is a reference to a clock defined in this same driver, so you can use { .hw = &pll4_vote.clkr.hw } to avoid the lookup all together.
Eh... pll4_vote is defined in gcc (for some reason) the one we have here is pll4.
I asked if this could be fixed in some way but it was said that it's better to not complicate things too much.
Quoted 36 lines
Quoted 36 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-7};static struct freq_tbl clk_tbl_aif_mi2s[] = {@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_mi2s_parents[] = { -"mi2s_osr_src" , -}; -static struct clk_branch mi2s_osr_clk = { .halt_reg =0x50 , .halt_bit =1 ,@@ -152,7 +150,9 @@ static struct clk_branch mi2s_osr_clk = { .enable_mask = BIT(17), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -167,7 +167,9 @@ static struct clk_regmap_div mi2s_div_clk = {
Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_regmap_div mi2s_div_clk = { · line 170
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-1.clkr = { .hw.init = &(struct clk_init_data){ .name = "mi2s_div_clk", - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw*[]){It would be wonderful if you could keep a space between ) and { in these.
You mean only here or in the entire patch? I assume the latter.
Quoted 28 lines
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-1+ &mi2s_osr_src.clkr.hw, + }, .num_parents = 1, .ops = &clk_regmap_div_ops, },@@ -183,7 +185,9 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_div_clk" , - .parent_names = (const char *[]){"mi2s_div_clk" }, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_div_clk.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,drivers/clk/qcom/lcc-ipq806x.c static struct clk_branch mi2s_bit_div_clk = { · line 200
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-0@@ -191,6 +195,10 @@ static struct clk_branch mi2s_bit_div_clk = { }, }; +static const struct clk_parent_data lcc_mi2s_bit_div_codec_clk[] = { + { .hw = &mi2s_bit_div_clk.clkr.hw, }, + { .fw_name ="mi2s_codec_clk" , .name ="mi2s_codec_clk" },Is
mi2s_codec_clkand external clock? I don't see it documented in the DT binding. And if we're introducing new clock-names, perhaps we could skip the_clksuffix - because obviously it's a clock :)
Quoted 3 lines
Regards,
Bjorn
I also didn't find where is mi2s_codec_clk... but yes I will change the fw_name with the clock with _clk stripped.
Will send v6 with the other question clarified.
Quoted 112 lines
Quoted 112 lines
drivers/clk/qcom/lcc-ipq806x.c +22
-22+};static struct clk_regmap_mux mi2s_bit_clk = { .reg =0x48 ,@@ -199,11 +207,8 @@ static struct clk_regmap_mux mi2s_bit_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_clk" , - .parent_names = (const char *[]){ -"mi2s_bit_div_clk" , -"mi2s_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_mi2s_bit_div_codec_clk, + .num_parents =ARRAY_SIZE (lcc_mi2s_bit_div_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -245,8 +250,8 @@ static struct clk_rcg pcm_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="pcm_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , },@@ -262,7 +267,9 @@ static struct clk_branch pcm_clk_out = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="pcm_clk_out" , - .parent_names = (const char *[]){"pcm_src" }, + .parent_hws = (const struct clk_hw *[]){ + &pcm_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -270,6 +277,11 @@ static struct clk_branch pcm_clk_out = { }, }; +static const struct clk_parent_data lcc_pcm_clk_out_codec_clk[] = { + { .hw = &pcm_clk_out.clkr.hw, }, + { .fw_name ="pcm_codec_clk" , .name ="pcm_codec_clk" }, +}; +static struct clk_regmap_mux pcm_clk = { .reg =0x54 , .shift =10 ,@@ -277,11 +289,8 @@ static struct clk_regmap_mux pcm_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="pcm_clk" , - .parent_names = (const char *[]){ -"pcm_clk_out" , -"pcm_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_pcm_clk_out_codec_clk, + .num_parents =ARRAY_SIZE (lcc_pcm_clk_out_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -325,18 +334,14 @@ static struct clk_rcg spdif_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="spdif_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_spdif_parents[] = { -"spdif_src" , -}; -static struct clk_branch spdif_clk = { .halt_reg =0xd4 , .halt_bit =1 ,@@ -346,7 +351,9 @@ static struct clk_branch spdif_clk = { .enable_mask = BIT(12), .hw.init = &(struct clk_init_data ){ .name ="spdif_clk" , - .parent_names = lcc_spdif_parents, + .parent_hws = (const struct clk_hw *[]){ + &spdif_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -384,8 +391,8 @@ static struct clk_rcg ahbix_clk = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="ahbix" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_lcc_ops, }, },Signature · 1 line
2.36.1
Signature · 1 line
Ansuel
Re: [PATCH v5 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 35 lines · Christian Marangi
Quoted 34 lines · Bjorn Andersson
Quoted 21 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo topxo_boarddrivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 38
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-1@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" ,This changes the behavior from looking for the globally named "pxo" to look for the globally named "
pxo_board", in the event that no clock-names of "pxo" was found (based on the .fw_name).
Quoted 7 lines
Quoted 2 lines
So you probably want to keep this as .fw_name = "pxo", .name = "pxo".
Hi,
I will make this change but just for reference, I could be wrong by Dimitry pointed out that the pattern is .fw_name pxo .namepxo_board. The original patch had both set to pxo and it was asked to be changed.
We are generally trying to get rid of manually registered 'pxo' clock, thus all parent_names = pxo/cxo/xo entries are converted to .fw_name = "pxo/cxo/xo", .name = "pxo_board/cxo_board/xo_board" clocks. This has been done previously for all converted drivers w/o any questions. May be it's worth it mentioning pxo_board in the commit message.
Quoted 20 lines
Quoted 9 lines
Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-0+ }, .num_parents = 1, .ops = &clk_pll_ops, },@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } };Quoted 10 lines
drivers/clk/qcom/lcc-ipq806x.c static const struct parent_map lcc_pxo_pll4_map[] = { · line 71
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-3-static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" },This is a reference to a clock defined in this same driver, so you can use { .hw = &pll4_vote.clkr.hw } to avoid the lookup all together.
Quoted 5 lines
Eh...
pll4_voteis defined in gcc (for some reason) the one we have here is pll4.I asked if this could be fixed in some way but it was said that it's better to not complicate things too much.
The chain is:
pxo -> pll4 @ lcc -> pll4_vote @ gcc -> i2s clocks @ lcc.
Quoted 77 lines
Quoted 37 lines
Quoted 37 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-7};static struct freq_tbl clk_tbl_aif_mi2s[] = {@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_mi2s_parents[] = { -"mi2s_osr_src" , -}; -static struct clk_branch mi2s_osr_clk = { .halt_reg =0x50 , .halt_bit =1 ,@@ -152,7 +150,9 @@ static struct clk_branch mi2s_osr_clk = { .enable_mask = BIT(17), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -167,7 +167,9 @@ static struct clk_regmap_div mi2s_div_clk = {Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_regmap_div mi2s_div_clk = { · line 170
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-1.clkr = { .hw.init = &(struct clk_init_data){ .name = "mi2s_div_clk", - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw*[]){It would be wonderful if you could keep a space between ) and { in these.
You mean only here or in the entire patch? I assume the latter.
Quoted 28 lines
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-1+ &mi2s_osr_src.clkr.hw, + }, .num_parents = 1, .ops = &clk_regmap_div_ops, },@@ -183,7 +185,9 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_div_clk" , - .parent_names = (const char *[]){"mi2s_div_clk" }, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_div_clk.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,drivers/clk/qcom/lcc-ipq806x.c static struct clk_branch mi2s_bit_div_clk = { · line 200
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-0@@ -191,6 +195,10 @@ static struct clk_branch mi2s_bit_div_clk = { }, }; +static const struct clk_parent_data lcc_mi2s_bit_div_codec_clk[] = { + { .hw = &mi2s_bit_div_clk.clkr.hw, }, + { .fw_name ="mi2s_codec_clk" , .name ="mi2s_codec_clk" },Is
mi2s_codec_clkand external clock? I don't see it documented in the DT binding. And if we're introducing new clock-names, perhaps we could skip the_clksuffix - because obviously it's a clock :)
Quoted 6 lines
Quoted 3 lines
Regards,
BjornI also didn't find where is
mi2s_codec_clk... but yes I will change thefw_namewith the clock with_clkstripped.
Downstream seems not to use _codec_clk, it just always uses the bit_div_clk as the codec's bit_clk. Maybe Srini knows additional details, as APQ8064 has more or less the same structure of clocks.
Quoted 3 lines
Will send v6 with the other question clarified.
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v5 3/3] clk: qcom: lcc-ipq806x: convert to parent data
In reply to Christian MarangiQuoted 35 lines · Christian Marangi
Quoted 34 lines · Bjorn Andersson
Quoted 21 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo topxo_boarddrivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 38
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-1@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" ,This changes the behavior from looking for the globally named "pxo" to look for the globally named "
pxo_board", in the event that no clock-names of "pxo" was found (based on the .fw_name).
Quoted 8 lines
Quoted 2 lines
So you probably want to keep this as .fw_name = "pxo", .name = "pxo".
Hi,
I will make this change but just for reference, I could be wrong by Dimitry pointed out that the pattern is .fw_name pxo .namepxo_board. The original patch had both set to pxo and it was asked to be changed.
I see, so we currently have gcc registering a fixed clock to "create" "pxo" out of "pxo_board" and with this change we'd hook onto pxo directly. Which would then allow us to drop the creation of "pxo" in gcc.
I'm in favor of this plan, but this makes the change not only a transition from parent_names to parent_data, so could you please document that you're changing this parent.
Quoted 19 lines
Quoted 8 lines
Quoted 8 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-0+ }, .num_parents = 1, .ops = &clk_pll_ops, },@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } };Quoted 10 lines
drivers/clk/qcom/lcc-ipq806x.c static const struct parent_map lcc_pxo_pll4_map[] = { · line 71
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-3-static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" },This is a reference to a clock defined in this same driver, so you can use { .hw = &pll4_vote.clkr.hw } to avoid the lookup all together.
Quoted 6 lines
Eh...
pll4_voteis defined in gcc (for some reason) the one we have here is pll4.I asked if this could be fixed in some way but it was said that it's better to not complicate things too much.
Sorry for the noise, I didn't pay attention to the gcc/lcc split. This seems reasonable.
Presumably though, you should make the pxo -> pxo_board transition for .name here as well then?
Regards,
Bjorn
Quoted 200 lines
Quoted 36 lines
Quoted 36 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-7};static struct freq_tbl clk_tbl_aif_mi2s[] = {@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_mi2s_parents[] = { -"mi2s_osr_src" , -}; -static struct clk_branch mi2s_osr_clk = { .halt_reg =0x50 , .halt_bit =1 ,@@ -152,7 +150,9 @@ static struct clk_branch mi2s_osr_clk = { .enable_mask = BIT(17), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_clk" , - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_osr_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -167,7 +167,9 @@ static struct clk_regmap_div mi2s_div_clk = {Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_regmap_div mi2s_div_clk = { · line 170
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-1.clkr = { .hw.init = &(struct clk_init_data){ .name = "mi2s_div_clk", - .parent_names = lcc_mi2s_parents, + .parent_hws = (const struct clk_hw*[]){It would be wonderful if you could keep a space between ) and { in these.
You mean only here or in the entire patch? I assume the latter.
Quoted 28 lines
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c +5
-1+ &mi2s_osr_src.clkr.hw, + }, .num_parents = 1, .ops = &clk_regmap_div_ops, },@@ -183,7 +185,9 @@ static struct clk_branch mi2s_bit_div_clk = { .enable_mask = BIT(15), .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_div_clk" , - .parent_names = (const char *[]){"mi2s_div_clk" }, + .parent_hws = (const struct clk_hw *[]){ + &mi2s_div_clk.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,drivers/clk/qcom/lcc-ipq806x.c static struct clk_branch mi2s_bit_div_clk = { · line 200
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-0@@ -191,6 +195,10 @@ static struct clk_branch mi2s_bit_div_clk = { }, }; +static const struct clk_parent_data lcc_mi2s_bit_div_codec_clk[] = { + { .hw = &mi2s_bit_div_clk.clkr.hw, }, + { .fw_name ="mi2s_codec_clk" , .name ="mi2s_codec_clk" },Is
mi2s_codec_clkand external clock? I don't see it documented in the DT binding. And if we're introducing new clock-names, perhaps we could skip the_clksuffix - because obviously it's a clock :)Quoted 3 lines
Regards,
BjornI also didn't find where is
mi2s_codec_clk... but yes I will change thefw_namewith the clock with_clkstripped.Will send v6 with the other question clarified.
Quoted 112 lines
Quoted 112 lines
drivers/clk/qcom/lcc-ipq806x.c +22
-22+};static struct clk_regmap_mux mi2s_bit_clk = { .reg =0x48 ,@@ -199,11 +207,8 @@ static struct clk_regmap_mux mi2s_bit_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="mi2s_bit_clk" , - .parent_names = (const char *[]){ -"mi2s_bit_div_clk" , -"mi2s_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_mi2s_bit_div_codec_clk, + .num_parents =ARRAY_SIZE (lcc_mi2s_bit_div_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -245,8 +250,8 @@ static struct clk_rcg pcm_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="pcm_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , },@@ -262,7 +267,9 @@ static struct clk_branch pcm_clk_out = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="pcm_clk_out" , - .parent_names = (const char *[]){"pcm_src" }, + .parent_hws = (const struct clk_hw *[]){ + &pcm_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -270,6 +277,11 @@ static struct clk_branch pcm_clk_out = { }, }; +static const struct clk_parent_data lcc_pcm_clk_out_codec_clk[] = { + { .hw = &pcm_clk_out.clkr.hw, }, + { .fw_name ="pcm_codec_clk" , .name ="pcm_codec_clk" }, +}; +static struct clk_regmap_mux pcm_clk = { .reg =0x54 , .shift =10 ,@@ -277,11 +289,8 @@ static struct clk_regmap_mux pcm_clk = { .clkr = { .hw.init = &(struct clk_init_data ){ .name ="pcm_clk" , - .parent_names = (const char *[]){ -"pcm_clk_out" , -"pcm_codec_clk" , - }, - .num_parents =2 , + .parent_data = lcc_pcm_clk_out_codec_clk, + .num_parents =ARRAY_SIZE (lcc_pcm_clk_out_codec_clk), .ops = &clk_regmap_mux_closest_ops, .flags =CLK_SET_RATE_PARENT , },@@ -325,18 +334,14 @@ static struct clk_rcg spdif_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="spdif_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_ops, .flags =CLK_SET_RATE_GATE , }, }, }; -static const char *const lcc_spdif_parents[] = { -"spdif_src" , -}; -static struct clk_branch spdif_clk = { .halt_reg =0xd4 , .halt_bit =1 ,@@ -346,7 +351,9 @@ static struct clk_branch spdif_clk = { .enable_mask = BIT(12), .hw.init = &(struct clk_init_data ){ .name ="spdif_clk" , - .parent_names = lcc_spdif_parents, + .parent_hws = (const struct clk_hw *[]){ + &spdif_src.clkr.hw, + }, .num_parents =1 , .ops = &clk_branch_ops, .flags =CLK_SET_RATE_PARENT ,@@ -384,8 +391,8 @@ static struct clk_rcg ahbix_clk = { .enable_mask = BIT(11), .hw.init = &(struct clk_init_data ){ .name ="ahbix" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4), .ops = &clk_rcg_lcc_ops, }, },Signature · 1 line
2.36.1Signature · 1 line
Ansuel
Re: [PATCH v5 3/3] clk: qcom: lcc-ipq806x: convert to parent data
In reply to Christian MarangiQuoted 45 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v5:
- Fix the same compilation error (don't know what the hell happen to my buildroot)
v4:
- Fix compilation error
v3:
- Inline pxo pll4 parent
- Change .name from pxo topxo_boarddrivers/clk/qcom/lcc-ipq806x.c | 77 ++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +6
-4@@ -34,7 +34,9 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="pxo" , .name ="pxo_board" , + }, .num_parents =1 , .ops = &clk_pll_ops, },@@ -64,9 +66,9 @@ static const struct parent_map lcc_pxo_pll4_map[] = { { P_PLL4, 2 } }; -static const char *const lcc_pxo_pll4[] = { -"pxo" , -"pll4_vote" , +static const struct clk_parent_data lcc_pxo_pll4[] = { + { .fw_name ="pxo" , .name ="pxo" }, + { .fw_name ="pll4_vote" , .name ="pll4_vote" }, };static struct freq_tbl clk_tbl_aif_mi2s[] = {
drivers/clk/qcom/lcc-ipq806x.c static struct clk_rcg mi2s_osr_src = { · line 137
Quoted 7 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-2@@ -131,18 +133,14 @@ static struct clk_rcg mi2s_osr_src = { .enable_mask = BIT(9), .hw.init = &(struct clk_init_data ){ .name ="mi2s_osr_src" , - .parent_names = lcc_pxo_pll4, - .num_parents =2 , + .parent_data = lcc_pxo_pll4, + .num_parents =ARRAY_SIZE (lcc_pxo_pll4),
We've typically done the ARRAY_SIZE conversion in a separate patch, as they're not related to "parent_data API", strictly speaking. (Except in the lcc_mi2s_bit_div_codec_clk etc case below, which was written inline previously).
- Marijn
[.. snip ..]