clk: meson: ao: use the new parent description method
v2 cover clk: meson: ao: use the new parent description method
Meson SoCs clock controllers use the string comparison method to describe parent relation between the clocks, which is not optimized.
Its also use bypass clock made from device-tree clock to provide an input clock which can be access through global name, but it still not optimal.
A recent patch [0] allows parents to be directly specified with device-tree clock name or without string names from localy declared clocks.
This patchset replaces clock string names by clock pointers (as possible), removes bypass clocks and uses directly device-tree clock names in parent assignment.
Tested on GXL, GXBB, Meson8b, AXG SoCs by comparing the clock summary (orphan too) before and after migration.
[0] commit fc0c209c147f ("clk: Allow parents to be specified without string names")
Change since v1:
- Improve clock parent assignment for "fixme" using name instead of fw_name.
Alexandre Mergnat (4):
clk: meson: g12a-aoclk: migrate to the new parent description method
clk: meson: gxbb-aoclk: migrate to the new parent description method
clk: meson: axg-aoclk: migrate to the new parent description method
clk: meson: remove ao input bypass clocks
drivers/clk/meson/Kconfig | 1 - drivers/clk/meson/axg-aoclk.c | 63 ++++++++++++++----------- drivers/clk/meson/g12a-aoclk.c | 81 ++++++++++++++++++++------------- drivers/clk/meson/gxbb-aoclk.c | 55 +++++++++++----------- drivers/clk/meson/meson-aoclk.c | 37 --------------- drivers/clk/meson/meson-aoclk.h | 8 ---- 6 files changed, 114 insertions(+), 131 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 clk: meson: g12a-aoclk: migrate to the new parent description method
This clock controller use the string comparison method to describe parent relation between the clocks, which is not optimized.
Migrate to the new way by using .parent_hws where possible (when parent clocks are localy declared in the controller) and use .parent_data otherwise.
Remove clk input helper and all bypass clocks (declared in probe function) which are no longer used since we are able to use device-tree clock name directly.
--- drivers/clk/meson/g12a-aoclk.c | 81 +++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 31 deletions(-)
drivers/clk/meson/g12a-aoclk.c +50 -31
@@ -18,8 +18,6 @@#include "clk-regmap.h" #include "clk-dualdiv.h" -#define IN_PREFIX "ao-in-" -/* * AO Configuration Clock registers offsets * Register offsets from the data sheet must be multiplied by 4.
@@ -51,7 +49,9 @@ static struct clk_regmap g12a_aoclk_##_name = { \ .hw.init = &(struct clk_init_data) { \ .name = "g12a_ao_" #_name, \ .ops = &clk_regmap_gate_ops, \ - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" }, \ + .parent_data = &(const struct clk_parent_data ) { \ + .fw_name ="mpeg-clk" , \ + }, \ .num_parents =1 , \ .flags =CLK_IGNORE_UNUSED , \ }, \
@@ -81,7 +81,9 @@ static struct clk_regmap g12a_aoclk_cts_oscin = { .hw.init = &(struct clk_init_data){ .name ="cts_oscin" , .ops = &clk_regmap_gate_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "xtal" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="xtal" , + }, .num_parents =1 , }, };
@@ -106,7 +108,9 @@ static struct clk_regmap g12a_aoclk_32k_by_oscin_pre = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_32k_by_oscin_pre" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"cts_oscin" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_cts_oscin.hw + }, .num_parents =1 , }, };
@@ -143,7 +147,9 @@ static struct clk_regmap g12a_aoclk_32k_by_oscin_div = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_32k_by_oscin_div" , .ops = &meson_clk_dualdiv_ops, - .parent_names = (const char *[]){"g12a_ao_32k_by_oscin_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_32k_by_oscin_pre.hw + }, .num_parents =1 , }, };
@@ -158,8 +164,10 @@ static struct clk_regmap g12a_aoclk_32k_by_oscin_sel = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_32k_by_oscin_sel" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"g12a_ao_32k_by_oscin_div" , -"g12a_ao_32k_by_oscin_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_32k_by_oscin_div.hw, + &g12a_aoclk_32k_by_oscin_pre.hw, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -173,7 +181,9 @@ static struct clk_regmap g12a_aoclk_32k_by_oscin = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_32k_by_oscin" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"g12a_ao_32k_by_oscin_sel" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_32k_by_oscin_sel.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -189,7 +199,9 @@ static struct clk_regmap g12a_aoclk_cec_pre = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_cec_pre" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"cts_oscin" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_cts_oscin.hw + }, .num_parents =1 , }, };
@@ -226,7 +238,9 @@ static struct clk_regmap g12a_aoclk_cec_div = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_cec_div" , .ops = &meson_clk_dualdiv_ops, - .parent_names = (const char *[]){"g12a_ao_cec_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_cec_pre.hw + }, .num_parents =1 , }, };
@@ -241,8 +255,10 @@ static struct clk_regmap g12a_aoclk_cec_sel = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_cec_sel" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"g12a_ao_cec_div" , -"g12a_ao_cec_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_cec_div.hw, + &g12a_aoclk_cec_pre.hw, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -256,7 +272,9 @@ static struct clk_regmap g12a_aoclk_cec = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_cec" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"g12a_ao_cec_sel" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_cec_sel.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -272,8 +290,10 @@ static struct clk_regmap g12a_aoclk_cts_rtc_oscin = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_cts_rtc_oscin" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"g12a_ao_32k_by_oscin" , -IN_PREFIX "ext_32k-0" }, + .parent_data = (const struct clk_parent_data []) { + { .hw = &g12a_aoclk_32k_by_oscin.hw }, + { .fw_name ="ext-32k-0" , }, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -289,8 +309,10 @@ static struct clk_regmap g12a_aoclk_clk81 = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_clk81" , .ops = &clk_regmap_mux_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" , -"g12a_ao_cts_rtc_oscin" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="mpeg-clk" , }, + { .hw = &g12a_aoclk_cts_rtc_oscin.hw }, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -305,8 +327,10 @@ static struct clk_regmap g12a_aoclk_saradc_mux = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_saradc_mux" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){IN_PREFIX "xtal" , -"g12a_ao_clk81" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="xtal" , }, + { .hw = &g12a_aoclk_clk81.hw }, + }, .num_parents =2 , }, };
@@ -320,7 +344,9 @@ static struct clk_regmap g12a_aoclk_saradc_div = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_saradc_div" , .ops = &clk_regmap_divider_ops, - .parent_names = (const char *[]){"g12a_ao_saradc_mux" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_saradc_mux.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -334,7 +360,9 @@ static struct clk_regmap g12a_aoclk_saradc_gate = { .hw.init = &(struct clk_init_data){ .name ="g12a_ao_saradc_gate" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"g12a_ao_saradc_div" }, + .parent_hws = (const struct clk_hw *[]) { + &g12a_aoclk_saradc_div.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -417,12 +445,6 @@ static const struct clk_hw_onecell_data g12a_aoclk_onecell_data = { .num = NR_CLKS, }; -static const struct meson_aoclk_input g12a_aoclk_inputs[] = { - { .name ="xtal" , .required = true }, - { .name ="mpeg-clk" , .required = true }, - { .name ="ext-32k-0" , .required = false }, -}; -static const struct meson_aoclk_data g12a_aoclkc_data = { .reset_reg =AO_RTI_GEN_CNTL_REG0 , .num_reset =ARRAY_SIZE (g12a_aoclk_reset),
@@ -430,9 +452,6 @@ static const struct meson_aoclk_data g12a_aoclkc_data = { .num_clks = ARRAY_SIZE(g12a_aoclk_regmap), .clks = g12a_aoclk_regmap, .hw_data = &g12a_aoclk_onecell_data, - .inputs = g12a_aoclk_inputs, - .num_inputs = ARRAY_SIZE(g12a_aoclk_inputs), - .input_prefix = IN_PREFIX, };static const struct of_device_id g12a_aoclkc_match_table[] = {
Signature · 1 line
2.17.1
PATCH v2 2/4 clk: meson: gxbb-aoclk: migrate to the new parent description method
In reply to Alexandre MergnatThis clock controller use the string comparison method to describe parent relation between the clocks, which is not optimized.
Migrate to the new way by using .parent_hws where possible (when parent clocks are localy declared in the controller) and use .parent_data otherwise.
Remove clk input helper and all bypass clocks (declared in probe function) which are no longer used since we are able to use device-tree clock name directly.
--- drivers/clk/meson/gxbb-aoclk.c | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-)
drivers/clk/meson/gxbb-aoclk.c +27 -28
@@ -11,8 +11,6 @@#include "clk-regmap.h" #include "clk-dualdiv.h" -#define IN_PREFIX "ao-in-" -/* AO Configuration Clock registers offsets */ #define AO_RTI_PWR_CNTL_REG1 0x0c#define AO_RTI_PWR_CNTL_REG0 0x10
@@ -31,7 +29,9 @@ static struct clk_regmap _name##_ao = { \ .hw.init = &(struct clk_init_data) { \ .name = #_name "_ao", \ .ops = &clk_regmap_gate_ops, \ - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" }, \ + .parent_data = &(const struct clk_parent_data ) { \ + .fw_name ="mpeg-clk" , \ + }, \ .num_parents =1 , \ .flags =CLK_IGNORE_UNUSED , \ }, \
@@ -52,7 +52,9 @@ static struct clk_regmap ao_cts_oscin = { .hw.init = &(struct clk_init_data){ .name ="ao_cts_oscin" , .ops = &clk_regmap_gate_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "xtal" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="xtal" , + }, .num_parents =1 , }, };
@@ -65,7 +67,7 @@ static struct clk_regmap ao_32k_pre = { .hw.init = &(struct clk_init_data){ .name ="ao_32k_pre" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"ao_cts_oscin" }, + .parent_hws = (const struct clk_hw *[]) { &ao_cts_oscin.hw }, .num_parents =1 , }, };
@@ -112,7 +114,7 @@ static struct clk_regmap ao_32k_div = { .hw.init = &(struct clk_init_data){ .name ="ao_32k_div" , .ops = &meson_clk_dualdiv_ops, - .parent_names = (const char *[]){"ao_32k_pre" }, + .parent_hws = (const struct clk_hw *[]) { &ao_32k_pre.hw }, .num_parents =1 , }, };
@@ -127,8 +129,10 @@ static struct clk_regmap ao_32k_sel = { .hw.init = &(struct clk_init_data){ .name ="ao_32k_sel" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"ao_32k_div" , -"ao_32k_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &ao_32k_div.hw, + &ao_32k_pre.hw + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -142,7 +146,7 @@ static struct clk_regmap ao_32k = { .hw.init = &(struct clk_init_data){ .name ="ao_32k" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"ao_32k_sel" }, + .parent_hws = (const struct clk_hw *[]) { &ao_32k_sel.hw }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -159,10 +163,12 @@ static struct clk_regmap ao_cts_rtc_oscin = { .hw.init = &(struct clk_init_data){ .name ="ao_cts_rtc_oscin" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){IN_PREFIX "ext-32k-0" , -IN_PREFIX "ext-32k-1" , -IN_PREFIX "ext-32k-2" , -"ao_32k" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="ext-32k-0" , }, + { .fw_name ="ext-32k-1" , }, + { .fw_name ="ext-32k-2" , }, + { .hw = &ao_32k.hw }, + }, .num_parents =4 , .flags =CLK_SET_RATE_PARENT , },
@@ -178,8 +184,10 @@ static struct clk_regmap ao_clk81 = { .hw.init = &(struct clk_init_data){ .name ="ao_clk81" , .ops = &clk_regmap_mux_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" , -"ao_cts_rtc_oscin" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="mpeg-clk" , }, + { .hw = &ao_cts_rtc_oscin.hw }, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -208,8 +216,10 @@ static struct clk_regmap ao_cts_cec = {* Until CCF gets fixed, adding this fake parent that won't * ever be registered should work around the problem */ - .parent_names = (const char *[]){ "fixme", - "ao_cts_rtc_oscin" }, + .parent_data = (const struct clk_parent_data []) { + { .name ="fixme" , .index =-1 , }, + { .hw = &ao_cts_rtc_oscin.hw }, + }, .num_parents = 2, .flags = CLK_SET_RATE_PARENT, },
@@ -261,14 +271,6 @@ static const struct clk_hw_onecell_data gxbb_aoclk_onecell_data = { .num = NR_CLKS, }; -static const struct meson_aoclk_input gxbb_aoclk_inputs[] = { - { .name ="xtal" , .required = true, }, - { .name ="mpeg-clk" , .required = true, }, - {. name ="ext-32k-0" , .required = false, }, - {. name ="ext-32k-1" , .required = false, }, - {. name ="ext-32k-2" , .required = false, }, -}; -static const struct meson_aoclk_data gxbb_aoclkc_data = { .reset_reg =AO_RTI_GEN_CNTL_REG0 , .num_reset =ARRAY_SIZE (gxbb_aoclk_reset),
@@ -276,9 +278,6 @@ static const struct meson_aoclk_data gxbb_aoclkc_data = { .num_clks = ARRAY_SIZE(gxbb_aoclk), .clks = gxbb_aoclk, .hw_data = &gxbb_aoclk_onecell_data, - .inputs = gxbb_aoclk_inputs, - .num_inputs = ARRAY_SIZE(gxbb_aoclk_inputs), - .input_prefix = IN_PREFIX, };static const struct of_device_id gxbb_aoclkc_match_table[] = {
Signature · 1 line
2.17.1
PATCH v2 3/4 clk: meson: axg-aoclk: migrate to the new parent description method
In reply to Alexandre MergnatThis clock controller use the string comparison method to describe parent relation between the clocks, which is not optimized.
Migrate to the new way by using .parent_hws where possible (when parent clocks are localy declared in the controller) and use .parent_data otherwise.
Remove clk input helper and all bypass clocks (declared in probe function) which are no longer used since we are able to use device-tree clock name directly.
--- drivers/clk/meson/axg-aoclk.c | 63 ++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 26 deletions(-)
drivers/clk/meson/axg-aoclk.c +37 -26
@@ -18,8 +18,6 @@#include "clk-regmap.h" #include "clk-dualdiv.h" -#define IN_PREFIX "ao-in-" -/* * AO Configuration Clock registers offsets * Register offsets from the data sheet must be multiplied by 4.
@@ -42,7 +40,9 @@ static struct clk_regmap axg_aoclk_##_name = { \ .hw.init = &(struct clk_init_data) { \ .name = "axg_ao_" #_name, \ .ops = &clk_regmap_gate_ops, \ - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" }, \ + .parent_data = &(const struct clk_parent_data ) { \ + .fw_name ="mpeg-clk" , \ + }, \ .num_parents =1 , \ .flags =CLK_IGNORE_UNUSED , \ }, \
@@ -64,7 +64,9 @@ static struct clk_regmap axg_aoclk_cts_oscin = { .hw.init = &(struct clk_init_data){ .name ="cts_oscin" , .ops = &clk_regmap_gate_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "xtal" }, + .parent_data = &(const struct clk_parent_data ) { + .fw_name ="xtal" , + }, .num_parents =1 , }, };
@@ -77,7 +79,9 @@ static struct clk_regmap axg_aoclk_32k_pre = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_32k_pre" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"cts_oscin" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_cts_oscin.hw + }, .num_parents =1 , }, };
@@ -124,7 +128,9 @@ static struct clk_regmap axg_aoclk_32k_div = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_32k_div" , .ops = &meson_clk_dualdiv_ops, - .parent_names = (const char *[]){"axg_ao_32k_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_32k_pre.hw + }, .num_parents =1 , }, };
@@ -139,8 +145,10 @@ static struct clk_regmap axg_aoclk_32k_sel = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_32k_sel" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"axg_ao_32k_div" , -"axg_ao_32k_pre" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_32k_div.hw, + &axg_aoclk_32k_pre.hw, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -154,7 +162,9 @@ static struct clk_regmap axg_aoclk_32k = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_32k" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"axg_ao_32k_sel" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_32k_sel.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -170,8 +180,10 @@ static struct clk_regmap axg_aoclk_cts_rtc_oscin = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_cts_rtc_oscin" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){"axg_ao_32k" , -IN_PREFIX "ext_32k-0" }, + .parent_data = (const struct clk_parent_data []) { + { .hw = &axg_aoclk_32k.hw }, + { .fw_name ="ext_32k-0" , }, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -187,8 +199,10 @@ static struct clk_regmap axg_aoclk_clk81 = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_clk81" , .ops = &clk_regmap_mux_ro_ops, - .parent_names = (const char *[]){IN_PREFIX "mpeg-clk" , -"axg_ao_cts_rtc_oscin" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="mpeg-clk" , }, + { .hw = &axg_aoclk_cts_rtc_oscin.hw }, + }, .num_parents =2 , .flags =CLK_SET_RATE_PARENT , },
@@ -203,8 +217,10 @@ static struct clk_regmap axg_aoclk_saradc_mux = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_saradc_mux" , .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){IN_PREFIX "xtal" , -"axg_ao_clk81" }, + .parent_data = (const struct clk_parent_data []) { + { .fw_name ="xtal" , }, + { .hw = &axg_aoclk_clk81.hw }, + }, .num_parents =2 , }, };
@@ -218,7 +234,9 @@ static struct clk_regmap axg_aoclk_saradc_div = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_saradc_div" , .ops = &clk_regmap_divider_ops, - .parent_names = (const char *[]){"axg_ao_saradc_mux" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_saradc_mux.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -232,7 +250,9 @@ static struct clk_regmap axg_aoclk_saradc_gate = { .hw.init = &(struct clk_init_data){ .name ="axg_ao_saradc_gate" , .ops = &clk_regmap_gate_ops, - .parent_names = (const char *[]){"axg_ao_saradc_div" }, + .parent_hws = (const struct clk_hw *[]) { + &axg_aoclk_saradc_div.hw + }, .num_parents =1 , .flags =CLK_SET_RATE_PARENT , },
@@ -290,12 +310,6 @@ static const struct clk_hw_onecell_data axg_aoclk_onecell_data = { .num = NR_CLKS, }; -static const struct meson_aoclk_input axg_aoclk_inputs[] = { - { .name ="xtal" , .required = true }, - { .name ="mpeg-clk" , .required = true }, - { .name ="ext-32k-0" , .required = false }, -}; -static const struct meson_aoclk_data axg_aoclkc_data = { .reset_reg =AO_RTI_GEN_CNTL_REG0 , .num_reset =ARRAY_SIZE (axg_aoclk_reset),
@@ -303,9 +317,6 @@ static const struct meson_aoclk_data axg_aoclkc_data = { .num_clks = ARRAY_SIZE(axg_aoclk_regmap), .clks = axg_aoclk_regmap, .hw_data = &axg_aoclk_onecell_data, - .inputs = axg_aoclk_inputs, - .num_inputs = ARRAY_SIZE(axg_aoclk_inputs), - .input_prefix = IN_PREFIX, };static const struct of_device_id axg_aoclkc_match_table[] = {
Signature · 1 line
2.17.1
PATCH v2 4/4 clk: meson: remove ao input bypass clocks
In reply to Alexandre MergnatDuring probe, bypass clocks (i.e. ao-in-xtal) are made from device-tree inputs to provide input clocks which can be access through global name. The cons of this method are the duplicated clocks, means more string comparison.
Specify parent directly with device-tree clock name.
Function to regiter bypass clocks is removed.
Input parameters from meson aoclk data structure are deprecated and then deleted since all aoclk files are migrated.
--- drivers/clk/meson/Kconfig | 1 - drivers/clk/meson/meson-aoclk.c | 37 --------------------------------- drivers/clk/meson/meson-aoclk.h | 8 ------- 3 files changed, 46 deletions(-)
drivers/clk/meson/Kconfig +0 -1
@@ -33,7 +33,6 @@ config COMMON_CLK_MESON_VID_PLL_DIV config COMMON_CLK_MESON_AO_CLKC tristate select COMMON_CLK_MESON_REGMAP - select COMMON_CLK_MESON_INPUT select RESET_CONTROLLER config COMMON_CLK_MESON_EE_CLKC
drivers/clk/meson/meson-aoclk.c +0 -37
@@ -17,8 +17,6 @@#include <linux/slab.h> #include "meson-aoclk.h" -#include "clk-input.h" -static int meson_aoclk_do_reset (struct reset_controller_dev *rcdev,unsigned long id) {
@@ -33,37 +31,6 @@ static const struct reset_control_ops meson_aoclk_reset_ops = { .reset = meson_aoclk_do_reset, }; -static int meson_aoclkc_register_inputs (struct device *dev, -struct meson_aoclk_data *data) -{ -struct clk_hw *hw; -char *str; -int i; - -for (i =0 ; i < data->num_inputs; i++) { -const struct meson_aoclk_input *in = &data->inputs[i]; - - str =kasprintf (GFP_KERNEL ,"%s%s" , data->input_prefix, - in->name); -if (!str) -return -ENOMEM ; - - hw =meson_clk_hw_register_input (dev, in->name, str,0 ); -kfree (str); - -if (IS_ERR (hw)) { -if (!in->required &&PTR_ERR (hw) == -ENOENT ) -continue ; -else if (PTR_ERR (hw) != -EPROBE_DEFER ) -dev_err (dev,"failed to register input %s\n" , - in->name); -return PTR_ERR (hw); - } - } - -return 0 ; -} -int meson_aoclkc_probe (struct platform_device *pdev) {struct meson_aoclk_reset_controller *rstc;
@@ -86,10 +53,6 @@ int meson_aoclkc_probe(struct platform_device *pdev)return PTR_ERR (regmap); } - ret =meson_aoclkc_register_inputs (dev, data); -if (ret) -return ret; -/* Reset Controller */ rstc->data = data; rstc->regmap = regmap;
drivers/clk/meson/meson-aoclk.h +0 -8
@@ -18,20 +18,12 @@#include "clk-regmap.h" -struct meson_aoclk_input { -const char *name; -bool required; -}; -struct meson_aoclk_data {const unsigned int reset_reg;const int num_reset;const unsigned int *reset;const int num_clks;struct clk_regmap **clks; -const int num_inputs; -const struct meson_aoclk_input *inputs; -const char *input_prefix;const struct clk_hw_onecell_data *hw_data; };
Signature · 1 line
2.17.1
Quoted 27 lines · Alexandre Mergnat
Meson SoCs clock controllers use the string comparison method to describe parent relation between the clocks, which is not optimized.
Its also use bypass clock made from device-tree clock to provide an input clock which can be access through global name, but it still not optimal.
A recent patch [0] allows parents to be directly specified with device-tree clock name or without string names from localy declared clocks.
This patchset replaces clock string names by clock pointers (as possible), removes bypass clocks and uses directly device-tree clock names in parent assignment.
Tested on GXL, GXBB, Meson8b, AXG SoCs by comparing the clock summary (orphan too) before and after migration.
[0] commit
fc0c209c147f("clk: Allow parents to be specified without string names")Change since v1:
- Improve clock parent assignment for "fixme" using name instead offw_name.Alexandre Mergnat (4):
clk: meson: g12a-aoclk: migrate to the new parent description method
clk: meson: gxbb-aoclk: migrate to the new parent description method
clk: meson: axg-aoclk: migrate to the new parent description method
clk: meson: remove ao input bypass clocks
Quoted 8 lines
drivers/clk/meson/Kconfig | 1 - drivers/clk/meson/axg-aoclk.c | 63 ++++++++++++++----------- drivers/clk/meson/g12a-aoclk.c | 81 ++++++++++++++++++++------------- drivers/clk/meson/gxbb-aoclk.c | 55 +++++++++++----------- drivers/clk/meson/meson-aoclk.c | 37 --------------- drivers/clk/meson/meson-aoclk.h | 8 ---- 6 files changed, 114 insertions(+), 131 deletions(-)
Applied
Thanks !
Quoted 2 lines
Signature · 1 line
2.17.1