Skip to content

Commit 9a77103

Browse files
committed
Merge tag 'renesas-clk-for-v5.18-tag2' 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 watchdog (WDT), I2C, and pin function controller (PFC) clocks on R-Car S4-8 - A small fix * tag 'renesas-clk-for-v5.18-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: r8a779f0: Add PFC clock clk: renesas: r8a779f0: Add I2C clocks clk: renesas: r8a779f0: Add WDT clock clk: renesas: r8a779f0: Fix RSW2 clock divider
2 parents 80a6359 + 73421f2 commit 9a77103

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static const struct cpg_core_clk r8a779f0_core_clks[] __initconst = {
103103
DEF_FIXED("s0d12_hsc", R8A779F0_CLK_S0D12_HSC, CLK_S0, 12, 1),
104104
DEF_FIXED("cl16m_hsc", R8A779F0_CLK_CL16M_HSC, CLK_S0, 48, 1),
105105
DEF_FIXED("s0d2_cc", R8A779F0_CLK_S0D2_CC, CLK_S0, 2, 1),
106-
DEF_FIXED("rsw2", R8A779F0_CLK_RSW2, CLK_PLL5, 2, 1),
106+
DEF_FIXED("rsw2", R8A779F0_CLK_RSW2, CLK_PLL5_DIV2, 5, 1),
107107
DEF_FIXED("cbfusa", R8A779F0_CLK_CBFUSA, CLK_EXTAL, 2, 1),
108108
DEF_FIXED("cpex", R8A779F0_CLK_CPEX, CLK_EXTAL, 2, 1),
109109

@@ -115,12 +115,24 @@ static const struct cpg_core_clk r8a779f0_core_clks[] __initconst = {
115115
};
116116

117117
static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {
118+
DEF_MOD("i2c0", 518, R8A779F0_CLK_S0D6_PER),
119+
DEF_MOD("i2c1", 519, R8A779F0_CLK_S0D6_PER),
120+
DEF_MOD("i2c2", 520, R8A779F0_CLK_S0D6_PER),
121+
DEF_MOD("i2c3", 521, R8A779F0_CLK_S0D6_PER),
122+
DEF_MOD("i2c4", 522, R8A779F0_CLK_S0D6_PER),
123+
DEF_MOD("i2c5", 523, R8A779F0_CLK_S0D6_PER),
118124
DEF_MOD("scif0", 702, R8A779F0_CLK_S0D12_PER),
119125
DEF_MOD("scif1", 703, R8A779F0_CLK_S0D12_PER),
120126
DEF_MOD("scif3", 704, R8A779F0_CLK_S0D12_PER),
121127
DEF_MOD("scif4", 705, R8A779F0_CLK_S0D12_PER),
122128
DEF_MOD("sys-dmac0", 709, R8A779F0_CLK_S0D3_PER),
123129
DEF_MOD("sys-dmac1", 710, R8A779F0_CLK_S0D3_PER),
130+
DEF_MOD("wdt", 907, R8A779F0_CLK_R),
131+
DEF_MOD("pfc0", 915, R8A779F0_CLK_CL16M),
132+
};
133+
134+
static const unsigned int r8a779f0_crit_mod_clks[] __initconst = {
135+
MOD_CLK_ID(907), /* WDT */
124136
};
125137

126138
/*
@@ -177,6 +189,10 @@ const struct cpg_mssr_info r8a779f0_cpg_mssr_info __initconst = {
177189
.num_mod_clks = ARRAY_SIZE(r8a779f0_mod_clks),
178190
.num_hw_mod_clks = 28 * 32,
179191

192+
/* Critical Module Clocks */
193+
.crit_mod_clks = r8a779f0_crit_mod_clks,
194+
.num_crit_mod_clks = ARRAY_SIZE(r8a779f0_crit_mod_clks),
195+
180196
/* Callbacks */
181197
.init = r8a779f0_cpg_mssr_init,
182198
.cpg_clk_register = rcar_gen4_cpg_clk_register,

0 commit comments

Comments
 (0)