dt-bindings: clock: add pcm reset for ipq806x lcc
PATCH v4 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 v4 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 v4 3/3 clk: qcom: lcc-ipq806x: convert to parent data
In reply to Christian MarangiConvert lcc-ipq806x driver to parent_data API.
---
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
kernel test robot
build botRe: [PATCH v4 3/3] clk: qcom: lcc-ipq806x: convert to parent data
Thank you for the patch! Yet something to improve:
Hi Christian,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on clk/clk-next]
[also build test ERROR on linus/master v5.19-rc5 next-20220707] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christian-Marangi/dt-bindings-clock-add-pcm-reset-for-ipq806x-lcc/20220707-181546 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: nios2-randconfig-r003-20220707 (https://download.01.org/0day-ci/archive/20220708/[email protected]/config) compiler: nios2-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/81953f04f08f730affa53b4637cc05f97da50a1d
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Christian-Marangi/dt-bindings-clock-add-pcm-reset-for-ipq806x-lcc/20220707-181546 git checkout 81953f04f08f730affa53b4637cc05f97da50a1d
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=nios2 SHELL=/bin/bash drivers/clk/qcom/
If you fix the issue, kindly add following tag where applicable
All errors (new ones prefixed by >>):
drivers/clk/qcom/lcc-ipq806x.c:38:25: warning: braces around scalar initializer
38 | { .fw_name = "pxo", .name = "pxo_board" },
| ^
drivers/clk/qcom/lcc-ipq806x.c:38:25: note: (near initialization for '(anonymous)[0]')
drivers/clk/qcom/lcc-ipq806x.c:38:27: error: field name not in record or union initializer
38 | { .fw_name = "pxo", .name = "pxo_board" },
| ^
drivers/clk/qcom/lcc-ipq806x.c:38:27: note: (near initialization for '(anonymous)[0]')
drivers/clk/qcom/lcc-ipq806x.c:38:38: error: initialization of 'const struct clk_parent_data *' from incompatible pointer type 'char *' [-Werror=incompatible-pointer-types]
38 | { .fw_name = "pxo", .name = "pxo_board" },
| ^~~~~
drivers/clk/qcom/lcc-ipq806x.c:38:38: note: (near initialization for '(anonymous)[0]')
drivers/clk/qcom/lcc-ipq806x.c:38:45: error: field name not in record or union initializer
38 | { .fw_name = "pxo", .name = "pxo_board" },
| ^
drivers/clk/qcom/lcc-ipq806x.c:38:45: note: (near initialization for '(anonymous)[0]')
drivers/clk/qcom/lcc-ipq806x.c:38:53: warning: excess elements in scalar initializer
38 | { .fw_name = "pxo", .name = "pxo_board" },
| ^~~~~~~~~~~
drivers/clk/qcom/lcc-ipq806x.c:38:53: note: (near initialization for '(anonymous)[0]')
>> drivers/clk/qcom/lcc-ipq806x.c:37:32: error: initialization of 'const struct clk_parent_data *' from incompatible pointer type 'const struct clk_parent_data **' [-Werror=incompatible-pointer-types]
37 | .parent_data = (const struct clk_parent_data*[]){
| ^ drivers/clk/qcom/lcc-ipq806x.c:37:32: note: (near initialization for '(anonymous).parent_data')
cc1: some warnings being treated as errors
vim +37 drivers/clk/qcom/lcc-ipq806x.c
26
27 static struct clk_pll pll4 = {
28 .l_reg = 0x4,
29 .m_reg = 0x8,
30 .n_reg = 0xc,
31 .config_reg = 0x14,
32 .mode_reg = 0x0,
33 .status_reg = 0x18,
34 .status_bit = 16,
35 .clkr.hw.init = &(struct clk_init_data){
36 .name = "pll4",
> 37 .parent_data = (const struct clk_parent_data*[]){
> 38 { .fw_name = "pxo", .name = "pxo_board" },
39 },
40 .num_parents = 1,
41 .ops = &clk_pll_ops,
42 },
43 };
44 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp