dt-bindings: clock: add pcm reset for ipq806x lcc
PATCH v2 1/3 dt-bindings: clock: add pcm reset for ipq806x lcc
Add pcm reset define for ipq806x lcc.
---
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 v2 2/3 clk: qcom: lcc-ipq806x: add reset definition
Add reset definition for lcc-ipq806x.
---
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
Re: [PATCH v2 2/3] clk: qcom: lcc-ipq806x: add reset definition
Quoted 4 lines · Christian Marangi
Add reset definition for lcc-ipq806x.
Signed-off-by Christian Marangi <[email protected]>
Quoted 6 lines
---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 7 +++++++ 1 file changed, 7 insertions(+)
Signature · 2 lines
With best wishes Dmitry
PATCH v2 3/3 clk: qcom: lcc-ipq806x: convert to parent data
In reply to Christian MarangiConvert lcc-ipq806x driver to parent_data API.
---
v2:
- Fix Sob tag
drivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)
drivers/clk/qcom/lcc-ipq806x.c +44 -35
@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h" +static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" }, +}; +static struct clk_pll pll4 = { .l_reg =0x4 , .m_reg =0x8 ,
@@ -34,7 +38,7 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = gcc_pxo, .num_parents =1 , .ops = &clk_pll_ops, },
@@ -64,9 +68,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 +135,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 +152,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 +169,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 +187,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 +197,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 +209,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 +252,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 +269,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 +279,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 +291,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 +336,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 +353,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 +393,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 v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 16 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0
drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h" +static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },
I think you'd use .name = "pxo_board" here. You don't need to use the interim clock.
drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 42
Quoted 12 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-1+}; +static struct clk_pll pll4 = { .l_reg =0x4 , .m_reg =0x8 ,@@ -34,7 +38,7 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = gcc_pxo, .num_parents =1 ,
Could you please either inline the gcc_pxo here (yes, it's ugly, but it works for small arrays) or use ARRAY_SIZE here.
Quoted 188 lines
drivers/clk/qcom/lcc-ipq806x.c +39
-35.ops = &clk_pll_ops, },@@ -64,9 +68,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 +135,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 +152,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 +169,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 +187,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 +197,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 +209,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 +252,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 +269,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 +279,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 +291,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 +336,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 +353,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 +393,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, }, }, --2.36.1
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 20 lines · Dmitry Baryshkov
Quoted 19 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h"
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 2 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0+static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },I think you'd use .name = "
pxo_board" here. You don't need to use the interim clock.
In gcc and in the rest of this driver we use pxo. Wonder what is right?
Quoted 7 lines
Quoted 7 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0+}; +static struct clk_pll pll4 = { .l_reg =0x4 , .m_reg =0x8 ,@@ -34,7 +38,7 @@ static struct clk_pll pll4 = { .status_bit = 16,
Quoted 9 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 42
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +1
-1.clkr.hw.init = &(struct clk_init_data){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = gcc_pxo, .num_parents =1 ,Could you please either inline the
gcc_pxohere (yes, it's ugly, but it works for small arrays) or useARRAY_SIZEhere.
Yes will inline gcc_pxo.
Quoted 193 lines
Quoted 188 lines
drivers/clk/qcom/lcc-ipq806x.c +39
-35.ops = &clk_pll_ops, },@@ -64,9 +68,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 +135,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 +152,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 +169,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 +187,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 +197,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 +209,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 +252,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 +269,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 +279,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 +291,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 +336,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 +353,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 +393,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, }, }, --2.36.1
Signature · 2 lines
With best wishes Dmitry
Signature · 1 line
Ansuel
Re: [PATCH v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 22 lines · Christian Marangi
Quoted 20 lines · Dmitry Baryshkov
Quoted 19 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h"
Quoted 8 lines
Quoted 6 lines
drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 2 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0+static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },I think you'd use .name = "
pxo_board" here. You don't need to use the interim clock.In gcc and in the rest of this driver we use pxo. Wonder what is right?
I'd use .fw_name = "pxo", .name = "pxo_board", like the rest of drivers do.
Quoted 216 lines
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 42
Quoted 13 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-1+}; +static struct clk_pll pll4 = { .l_reg =0x4 , .m_reg =0x8 ,@@ -34,7 +38,7 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = gcc_pxo, .num_parents =1 ,Could you please either inline the
gcc_pxohere (yes, it's ugly, but it works for small arrays) or useARRAY_SIZEhere.Yes will inline
gcc_pxo.Quoted 185 lines
Quoted 185 lines
drivers/clk/qcom/lcc-ipq806x.c +39
-34.ops = &clk_pll_ops, },@@ -64,9 +68,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 +135,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 +152,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 +169,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 +187,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 +197,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 +209,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 +252,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 +269,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 +279,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 +291,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 +336,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 +353,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 +393,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, }, },Quoted 8 lines
Quoted 3 lines
--
2.36.1--
With best wishes
Dmitry--
Ansuel
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 30 lines · Dmitry Baryshkov
Quoted 29 lines · Christian Marangi
Quoted 26 lines · Dmitry Baryshkov
Quoted 16 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h" +static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },I think you'd use .name = "
pxo_board" here. You don't need to use the interim clock.
Quoted 4 lines
Quoted 1 line
In gcc and in the rest of this driver we use pxo. Wonder what is right?
I'd use .fw_name = "pxo", .name = "
pxo_board", like the rest of drivers do.
Will do the change, but I need an explaination... Is the use of pxo_board correct?
I'm sending a patch that sets the pxo_board fixed clock in dts to output "pxo". The only clock that still use pxo_board is rpm, everything else at least for ipq806x use pxo and i'm sending a patch to use pxo for rpm.
Considering pxo is always present and pxo_board should be dropped because every ipq806x driver use "pxo".
What is correct naming pxo or pxo_board? I assume pxo right?
Quoted 222 lines
Quoted 216 lines
Quoted 17 lines
drivers/clk/qcom/lcc-ipq806x.c static struct clk_pll pll4 = { · line 42
Quoted 13 lines
drivers/clk/qcom/lcc-ipq806x.c +3
-1+}; +static struct clk_pll pll4 = { .l_reg =0x4 , .m_reg =0x8 ,@@ -34,7 +38,7 @@ static struct clk_pll pll4 = { .status_bit = 16, .clkr.hw.init = &(struct clk_init_data ){ .name ="pll4" , - .parent_names = (const char *[]){"pxo" }, + .parent_data = gcc_pxo, .num_parents =1 ,Could you please either inline the
gcc_pxohere (yes, it's ugly, but it works for small arrays) or useARRAY_SIZEhere.Yes will inline
gcc_pxo.Quoted 185 lines
Quoted 185 lines
drivers/clk/qcom/lcc-ipq806x.c +39
-34.ops = &clk_pll_ops, },@@ -64,9 +68,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 +135,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 +152,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 +169,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 +187,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 +197,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 +209,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 +252,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 +269,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 +279,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 +291,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 +336,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 +353,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 +393,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, }, },Quoted 8 lines
Quoted 3 lines
--
2.36.1--
With best wishes
Dmitry--
AnsuelSignature · 2 lines
With best wishes Dmitry
Signature · 1 line
Ansuel
Re: [PATCH v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 40 lines · Christian Marangi
Quoted 30 lines · Dmitry Baryshkov
Quoted 29 lines · Christian Marangi
Quoted 26 lines · Dmitry Baryshkov
Quoted 16 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h" +static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },I think you'd use .name = "
pxo_board" here. You don't need to use the interim clock.Quoted 4 lines
Quoted 1 line
In gcc and in the rest of this driver we use pxo. Wonder what is right?
I'd use .fw_name = "pxo", .name = "
pxo_board", like the rest of drivers do.Will do the change, but I need an explaination... Is the use of
pxo_boardcorrect?
Quoted 8 lines
I'm sending a patch that sets the
pxo_boardfixed clock in dts to output "pxo". The only clock that still usepxo_boardis rpm, everything else at least for ipq806x use pxo and i'm sending a patch to use pxo for rpm.Considering pxo is always present and
pxo_boardshould be dropped because every ipq806x driver use "pxo".What is correct naming pxo or
pxo_board? I assume pxo right?
This might be not the case for the ipq806x, but here is the story for all other (old) platforms:
- gcc driver manually registered pxo/cxo/xo fixed factor clocks.
- Then we started adding *xo_board clocks to the DT, as they represent the external oscillators
- PXO clock consumers receive a clocks entry with clock-names = "pxo" which points to the pxo_board
- All clock drivers are now being switched to use .fw_name = "pxo", .name = "pxo_board" to use the DT-defined pxo_board clock.
Hopefully at some point we can then drop the manually registered pxo clock and always use the DT-based one.
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v2 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Quoted 60 lines · Dmitry Baryshkov
Quoted 40 lines · Christian Marangi
Quoted 30 lines · Dmitry Baryshkov
Quoted 29 lines · Christian Marangi
Quoted 26 lines · Dmitry Baryshkov
Quoted 16 lines · Christian Marangi
Convert lcc-ipq806x driver to
parent_dataAPI.Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob tagdrivers/clk/qcom/lcc-ipq806x.c | 79 +++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 35 deletions(-)drivers/clk/qcom/lcc-ipq806x.c +0
-0drivers/clk/qcom/lcc-ipq806x.c line 28
Quoted 5 lines
drivers/clk/qcom/lcc-ipq806x.c +2
-0@@ -24,6 +24,10 @@#include "clk-regmap-mux.h" #include "reset.h" +static const struct clk_parent_data gcc_pxo[] = { + { .fw_name ="pxo" , .name ="pxo" },I think you'd use .name = "
pxo_board" here. You don't need to use the interim clock.Quoted 4 lines
Quoted 1 line
In gcc and in the rest of this driver we use pxo. Wonder what is right?
I'd use .fw_name = "pxo", .name = "
pxo_board", like the rest of drivers do.Will do the change, but I need an explaination... Is the use of
pxo_boardcorrect?Quoted 8 lines
I'm sending a patch that sets the
pxo_boardfixed clock in dts to output "pxo". The only clock that still usepxo_boardis rpm, everything else at least for ipq806x use pxo and i'm sending a patch to use pxo for rpm.Considering pxo is always present and
pxo_boardshould be dropped because every ipq806x driver use "pxo".What is correct naming pxo or
pxo_board? I assume pxo right?This might be not the case for the ipq806x, but here is the story for all other (old) platforms:
- gcc driver manually registered pxo/cxo/xo fixed factor clocks.
- Then we started adding*xo_boardclocks to the DT, as they represent the external oscillators
- PXO clock consumers receive a clocks entry with clock-names = "pxo" which points to thepxo_board
- All clock drivers are now being switched to use .fw_name = "pxo", .name = "pxo_board" to use the DT-definedpxo_boardclock.
Quoted 3 lines
Hopefully at some point we can then drop the manually registered pxo clock and always use the DT-based one.
Okok. I got confused since looking at the code factor clock is really just a hack to handle both driver that use pxo_board and pxo cause from what I notice it's the same clock with different naming.
Sooo keep using pxo_board with the fact that pxo is always present seems to be redundant but if that's the pattern then I will just keep pxo_board in .name where it's used.
Quoted 3 lines
Signature · 2 lines
With best wishes Dmitry
Signature · 1 line
Ansuel
Quoted 4 lines · Christian Marangi
Add pcm reset define for ipq806x lcc.
Signed-off-by Christian Marangi <[email protected]>
Quoted 21 lines
---
v2:
- Fix Sob taginclude/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 ++ 1 file changed, 2 insertions(+)include/dt-bindings/clock/qcom,lcc-ipq806x.h +2
-1@@ -19,4 +19,6 @@#define SPDIF_CLK 10#define AHBIX_CLK 11 +#define LCC_PCM_RESET 0 +#endif --2.36.1
Signature · 2 lines
With best wishes Dmitry
Quoted 10 lines · Christian Marangi
Add pcm reset define for ipq806x lcc.
Signed-off-by Christian Marangi <[email protected]>---
v2:
- Fix Sob taginclude/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 ++ 1 file changed, 2 insertions(+)