Skip to content

Commit f7444f0

Browse files
committed
clk: renesas: rcar-gen4: Remove unused fixed PLL clock types
All users of the fixed default PLL2/3/4/6 clock types have been converted to fixed or variable fractional PLL clock types. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Yoshihiro Shimoda <[email protected]> Link: https://lore.kernel.org/c0229eb3518444f61173c6fb83bdcedb058dd079.1721648548.git.geert+renesas@glider.be
1 parent ccdf745 commit f7444f0

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

drivers/clk/renesas/rcar-gen4-cpg.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -440,31 +440,11 @@ struct clk * __init rcar_gen4_cpg_clk_register(struct device *dev,
440440
div = cpg_pll_config->pll1_div;
441441
break;
442442

443-
case CLK_TYPE_GEN4_PLL2:
444-
mult = cpg_pll_config->pll2_mult;
445-
div = cpg_pll_config->pll2_div;
446-
break;
447-
448-
case CLK_TYPE_GEN4_PLL3:
449-
mult = cpg_pll_config->pll3_mult;
450-
div = cpg_pll_config->pll3_div;
451-
break;
452-
453-
case CLK_TYPE_GEN4_PLL4:
454-
mult = cpg_pll_config->pll4_mult;
455-
div = cpg_pll_config->pll4_div;
456-
break;
457-
458443
case CLK_TYPE_GEN4_PLL5:
459444
mult = cpg_pll_config->pll5_mult;
460445
div = cpg_pll_config->pll5_div;
461446
break;
462447

463-
case CLK_TYPE_GEN4_PLL6:
464-
mult = cpg_pll_config->pll6_mult;
465-
div = cpg_pll_config->pll6_div;
466-
break;
467-
468448
case CLK_TYPE_GEN4_PLL2X_3X:
469449
value = readl(base + core->offset);
470450
mult = (FIELD_GET(CPG_PLLxCR_STC, value) + 1) * 2;

drivers/clk/renesas/rcar-gen4-cpg.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@
1212
enum rcar_gen4_clk_types {
1313
CLK_TYPE_GEN4_MAIN = CLK_TYPE_CUSTOM,
1414
CLK_TYPE_GEN4_PLL1,
15-
CLK_TYPE_GEN4_PLL2,
1615
CLK_TYPE_GEN4_PLL2X_3X, /* r8a779a0 only */
17-
CLK_TYPE_GEN4_PLL3,
18-
CLK_TYPE_GEN4_PLL4,
1916
CLK_TYPE_GEN4_PLL5,
20-
CLK_TYPE_GEN4_PLL6,
2117
CLK_TYPE_GEN4_PLL_F8_25, /* Fixed fractional 8.25 PLL */
2218
CLK_TYPE_GEN4_PLL_V8_25, /* Variable fractional 8.25 PLL */
2319
CLK_TYPE_GEN4_PLL_F9_24, /* Fixed fractional 9.24 PLL */

0 commit comments

Comments
 (0)