clk: renesas: Miscellaneous cleanups
Subsystems (2)
Geert Uytterhoeven
maintainercover clk: renesas: Miscellaneous cleanups
Hi all,
Here is a set of miscellaneous cleanups for Renesas clock drivers. I intened to queue these in renesas-clk for v6.15.
Thanks for your comments!
Geert Uytterhoeven (3):
clk: renesas: cpg-mssr: Remove obsolete nullify check
clk: renesas: rzg2l: Remove unneeded nullify checks
clk: renesas: r7s9210: Distinguish clocks by clock type
drivers/clk/renesas/r7s9210-cpg-mssr.c | 10 ++++------ drivers/clk/renesas/renesas-cpg-mssr.c | 5 ----- drivers/clk/renesas/rzg2l-cpg.c | 10 ---------- 3 files changed, 4 insertions(+), 21 deletions(-)
Signature · 12 lines
2.43.0
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH 1/3 clk: renesas: cpg-mssr: Remove obsolete nullify check
All core clock nullify users and helpers were removed in commit b1dec4e78599a2ce ("clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*"), but the CPG/MSSR driver still checks for nullified core clocks. Remove the obsolete check.
--- drivers/clk/renesas/renesas-cpg-mssr.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/clk/renesas/renesas-cpg-mssr.c +0 -5
@@ -338,11 +338,6 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,WARN_DEBUG (id >= priv->num_core_clks);WARN_DEBUG (PTR_ERR (priv->clks[id]) != -ENOENT ); -if (!core->name) { -/* Skip NULLified clock */ -return ; - } -switch (core->type) {case CLK_TYPE_IN : clk =of_clk_get_by_name (priv->np, core->name);
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH 2/3 clk: renesas: rzg2l: Remove unneeded nullify checks
In reply to Geert UytterhoevenRZ/G2L family clock drivers never had a need to nullify clocks. Remove the unneeded checks.
--- drivers/clk/renesas/rzg2l-cpg.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +0 -10
@@ -1116,11 +1116,6 @@ rzg2l_cpg_register_core_clk(const struct cpg_core_clk *core,WARN_DEBUG (id >= priv->num_core_clks);WARN_DEBUG (PTR_ERR (priv->clks[id]) != -ENOENT ); -if (!core->name) { -/* Skip NULLified clock */ -return ; - } -switch (core->type) {case CLK_TYPE_IN : clk =of_clk_get_by_name (priv->dev->of_node, core->name);
@@ -1355,11 +1350,6 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod,WARN_DEBUG (mod->parent >= priv->num_core_clks + priv->num_mod_clks);WARN_DEBUG (PTR_ERR (priv->clks[id]) != -ENOENT ); -if (!mod->name) { -/* Skip NULLified clock */ -return ; - } - parent = priv->clks[mod->parent];if (IS_ERR (parent)) { clk = parent;
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH 3/3 clk: renesas: r7s9210: Distinguish clocks by clock type
In reply to Geert UytterhoevenWhen registering a clock, its type should be devised from the clock's type member, not from its id member.
Merge the two checks for the main clock, to improve readability.
--- drivers/clk/renesas/r7s9210-cpg-mssr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clk/renesas/r7s9210-cpg-mssr.c +4 -6
@@ -170,11 +170,12 @@ static struct clk * __init rza2_cpg_clk_register(struct device *dev,if (IS_ERR (parent))return ERR_CAST (parent); -switch (core->id) { -case CLK_MAIN : +switch (core->type) { +case CLK_TYPE_RZA_MAIN : +r7s9210_update_clk_table (parent, base);break ; -case CLK_PLL : +case CLK_TYPE_RZA_PLL :if (cpg_mode) mult =44 ;/* Divider 1 is 1/2 */ else
@@ -185,9 +186,6 @@ static struct clk * __init rza2_cpg_clk_register(struct device *dev,return ERR_PTR (-EINVAL ); } -if (core->id ==CLK_MAIN ) -r7s9210_update_clk_table (parent, base); -return clk_register_fixed_factor (NULL , core->name,__clk_get_name (parent),0 , mult, div); }
Signature · 1 line
2.43.0