Skip to content

Commit f73b836

Browse files
committed
Merge tag 'renesas-clk-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas
Pull Renesas clk driver updates from Geert Uytterhoeven: - Add PWM clock on Renesas R-Car V3U - Fix PLL5 on Renesas RZ/G2L and RZ/V2L * tag 'renesas-clk-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: rzg2l: Fix CPG_SIPLL5_CLK1 register write clk: renesas: r8a779a0: Add PWM clock
2 parents ac9a786 + d1c2088 commit f73b836

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ static const struct mssr_mod_clk r8a779a0_mod_clks[] __initconst = {
170170
DEF_MOD("msi3", 621, R8A779A0_CLK_MSO),
171171
DEF_MOD("msi4", 622, R8A779A0_CLK_MSO),
172172
DEF_MOD("msi5", 623, R8A779A0_CLK_MSO),
173+
DEF_MOD("pwm0", 628, R8A779A0_CLK_S1D8),
173174
DEF_MOD("rpc-if", 629, R8A779A0_CLK_RPCD2),
174175
DEF_MOD("scif0", 702, R8A779A0_CLK_S1D8),
175176
DEF_MOD("scif1", 703, R8A779A0_CLK_S1D8),

drivers/clk/renesas/rzg2l-cpg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,10 +603,8 @@ static int rzg2l_cpg_sipll5_set_rate(struct clk_hw *hw,
603603
}
604604

605605
/* Output clock setting 1 */
606-
writel(CPG_SIPLL5_CLK1_POSTDIV1_WEN | CPG_SIPLL5_CLK1_POSTDIV2_WEN |
607-
CPG_SIPLL5_CLK1_REFDIV_WEN | (params.pl5_postdiv1 << 0) |
608-
(params.pl5_postdiv2 << 4) | (params.pl5_refdiv << 8),
609-
priv->base + CPG_SIPLL5_CLK1);
606+
writel((params.pl5_postdiv1 << 0) | (params.pl5_postdiv2 << 4) |
607+
(params.pl5_refdiv << 8), priv->base + CPG_SIPLL5_CLK1);
610608

611609
/* Output clock setting, SSCG modulation value setting 3 */
612610
writel((params.pl5_fracin << 8), priv->base + CPG_SIPLL5_CLK3);

drivers/clk/renesas/rzg2l-cpg.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
#define CPG_SIPLL5_STBY_RESETB_WEN BIT(16)
3333
#define CPG_SIPLL5_STBY_SSCG_EN_WEN BIT(18)
3434
#define CPG_SIPLL5_STBY_DOWNSPREAD_WEN BIT(20)
35-
#define CPG_SIPLL5_CLK1_POSTDIV1_WEN BIT(16)
36-
#define CPG_SIPLL5_CLK1_POSTDIV2_WEN BIT(20)
37-
#define CPG_SIPLL5_CLK1_REFDIV_WEN BIT(24)
3835
#define CPG_SIPLL5_CLK4_RESV_LSB (0xFF)
3936
#define CPG_SIPLL5_MON_PLL5_LOCK BIT(4)
4037

0 commit comments

Comments
 (0)