Skip to content

Commit 93d46d4

Browse files
committed
clk: renesas: rcar-gen4: Remove unused default PLL2/3/4/6 configs
The default PLL2/3/4/6 multiplier and divider configurations are no longer used after the conversion to fixed or variable fractional PLL clock types. Note that the default configurations are still documented in the comments above the individual rcar_gen4_cpg_pll_config instances. Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/d13526a86066992d6afdf9bee7c1a18da72f914f.1721648548.git.geert+renesas@glider.be
1 parent f7444f0 commit 93d46d4

File tree

5 files changed

+20
-28
lines changed

5 files changed

+20
-28
lines changed

drivers/clk/renesas/r8a779a0-cpg-mssr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ static const unsigned int r8a779a0_crit_mod_clks[] __initconst = {
259259
#define CPG_PLL_CONFIG_INDEX(md) ((((md) & BIT(14)) >> 13) | \
260260
(((md) & BIT(13)) >> 13))
261261
static const struct rcar_gen4_cpg_pll_config cpg_pll_configs[4] __initconst = {
262-
/* EXTAL div PLL1 mult/div PLL2 mult/div PLL3 mult/div PLL4 mult/div PLL5 mult/div PLL6 mult/div OSC prediv */
263-
{ 1, 128, 1, 0, 0, 0, 0, 144, 1, 192, 1, 0, 0, 16, },
264-
{ 1, 106, 1, 0, 0, 0, 0, 120, 1, 160, 1, 0, 0, 19, },
265-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
266-
{ 2, 128, 1, 0, 0, 0, 0, 144, 1, 192, 1, 0, 0, 32, },
262+
/* EXTAL div PLL1 mult/div PLL5 mult/div OSC prediv */
263+
{ 1, 128, 1, 192, 1, 16, },
264+
{ 1, 106, 1, 160, 1, 19, },
265+
{ 0, 0, 0, 0, 0, 0, },
266+
{ 2, 128, 1, 192, 1, 32, },
267267
};
268268

269269

drivers/clk/renesas/r8a779f0-cpg-mssr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ static const unsigned int r8a779f0_crit_mod_clks[] __initconst = {
188188
(((md) & BIT(13)) >> 13))
189189

190190
static const struct rcar_gen4_cpg_pll_config cpg_pll_configs[4] __initconst = {
191-
/* EXTAL div PLL1 mult/div PLL2 mult/div PLL3 mult/div PLL4 mult/div PLL5 mult/div PLL6 mult/div OSC prediv */
192-
{ 1, 200, 1, 150, 1, 200, 1, 0, 0, 200, 1, 134, 1, 15, },
193-
{ 1, 160, 1, 120, 1, 160, 1, 0, 0, 160, 1, 106, 1, 19, },
194-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
195-
{ 2, 160, 1, 120, 1, 160, 1, 0, 0, 160, 1, 106, 1, 38, },
191+
/* EXTAL div PLL1 mult/div PLL5 mult/div OSC prediv */
192+
{ 1, 200, 1, 200, 1, 15, },
193+
{ 1, 160, 1, 160, 1, 19, },
194+
{ 0, 0, 0, 0, 0, 0, },
195+
{ 2, 160, 1, 160, 1, 38, },
196196
};
197197

198198
static int __init r8a779f0_cpg_mssr_init(struct device *dev)

drivers/clk/renesas/r8a779g0-cpg-mssr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ static const struct mssr_mod_clk r8a779g0_mod_clks[] __initconst = {
259259
(((md) & BIT(13)) >> 13))
260260

261261
static const struct rcar_gen4_cpg_pll_config cpg_pll_configs[4] __initconst = {
262-
/* EXTAL div PLL1 mult/div PLL2 mult/div PLL3 mult/div PLL4 mult/div PLL5 mult/div PLL6 mult/div OSC prediv */
263-
{ 1, 192, 1, 204, 1, 192, 1, 144, 1, 192, 1, 168, 1, 16, },
264-
{ 1, 160, 1, 170, 1, 160, 1, 120, 1, 160, 1, 140, 1, 19, },
265-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
266-
{ 2, 192, 1, 204, 1, 192, 1, 144, 1, 192, 1, 168, 1, 32, },
262+
/* EXTAL div PLL1 mult/div PLL5 mult/div OSC prediv */
263+
{ 1, 192, 1, 192, 1, 16, },
264+
{ 1, 160, 1, 160, 1, 19, },
265+
{ 0, 0, 0, 0, 0, 0, },
266+
{ 2, 192, 1, 192, 1, 32, },
267267
};
268268

269269
static int __init r8a779g0_cpg_mssr_init(struct device *dev)

drivers/clk/renesas/r8a779h0-cpg-mssr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ static const struct mssr_mod_clk r8a779h0_mod_clks[] __initconst = {
254254
(((md) & BIT(13)) >> 13))
255255

256256
static const struct rcar_gen4_cpg_pll_config cpg_pll_configs[4] __initconst = {
257-
/* EXTAL div PLL1 mult/div PLL2 mult/div PLL3 mult/div PLL4 mult/div PLL5 mult/div PLL6 mult/div OSC prediv */
258-
{ 1, 192, 1, 240, 1, 192, 1, 240, 1, 192, 1, 168, 1, 16, },
259-
{ 1, 160, 1, 200, 1, 160, 1, 200, 1, 160, 1, 140, 1, 19, },
260-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
261-
{ 2, 192, 1, 240, 1, 192, 1, 240, 1, 192, 1, 168, 1, 32, },
257+
/* EXTAL div PLL1 mult/div PLL5 mult/div OSC prediv */
258+
{ 1, 192, 1, 192, 1, 16, },
259+
{ 1, 160, 1, 160, 1, 19, },
260+
{ 0, 0, 0, 0, 0, 0, },
261+
{ 2, 192, 1, 192, 1, 32, },
262262
};
263263

264264
static int __init r8a779h0_cpg_mssr_init(struct device *dev)

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,8 @@ struct rcar_gen4_cpg_pll_config {
6565
u8 extal_div;
6666
u8 pll1_mult;
6767
u8 pll1_div;
68-
u8 pll2_mult;
69-
u8 pll2_div;
70-
u8 pll3_mult;
71-
u8 pll3_div;
72-
u8 pll4_mult;
73-
u8 pll4_div;
7468
u8 pll5_mult;
7569
u8 pll5_div;
76-
u8 pll6_mult;
77-
u8 pll6_div;
7870
u8 osc_prediv;
7971
};
8072

0 commit comments

Comments
 (0)