Skip to content

Commit a09b2d6

Browse files
committed
Merge tag 'renesas-clk-for-v6.10-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 thermal, serial (SCIF), and timer (CMT/TMU) clocks on R-Car V4M - Miscellaneous fixes and improvements * tag 'renesas-clk-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: r8a779h0: Add timer clocks clk: renesas: r8a779h0: Add SCIF clocks clk: renesas: r9a07g044: Mark resets array as const clk: renesas: r9a07g043: Mark mod_clks and resets arrays as const clk: renesas: r8a779h0: Add thermal clock dt-bindings: clock: r9a07g043-cpg: Annotate RZ/G2UL-only core clocks
2 parents 4cece76 + c0516eb commit a09b2d6

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,27 @@ static const struct mssr_mod_clk r8a779h0_mod_clks[] = {
185185
DEF_MOD("i2c2", 520, R8A779H0_CLK_S0D6_PER),
186186
DEF_MOD("i2c3", 521, R8A779H0_CLK_S0D6_PER),
187187
DEF_MOD("rpc-if", 629, R8A779H0_CLK_RPCD2),
188+
DEF_MOD("scif0", 702, R8A779H0_CLK_SASYNCPERD4),
189+
DEF_MOD("scif1", 703, R8A779H0_CLK_SASYNCPERD4),
190+
DEF_MOD("scif3", 704, R8A779H0_CLK_SASYNCPERD4),
191+
DEF_MOD("scif4", 705, R8A779H0_CLK_SASYNCPERD4),
188192
DEF_MOD("sdhi0", 706, R8A779H0_CLK_SD0),
189193
DEF_MOD("sydm1", 709, R8A779H0_CLK_S0D6_PER),
190194
DEF_MOD("sydm2", 710, R8A779H0_CLK_S0D6_PER),
195+
DEF_MOD("tmu0", 713, R8A779H0_CLK_SASYNCRT),
196+
DEF_MOD("tmu1", 714, R8A779H0_CLK_SASYNCPERD2),
197+
DEF_MOD("tmu2", 715, R8A779H0_CLK_SASYNCPERD2),
198+
DEF_MOD("tmu3", 716, R8A779H0_CLK_SASYNCPERD2),
199+
DEF_MOD("tmu4", 717, R8A779H0_CLK_SASYNCPERD2),
191200
DEF_MOD("wdt1:wdt0", 907, R8A779H0_CLK_R),
201+
DEF_MOD("cmt0", 910, R8A779H0_CLK_R),
202+
DEF_MOD("cmt1", 911, R8A779H0_CLK_R),
203+
DEF_MOD("cmt2", 912, R8A779H0_CLK_R),
204+
DEF_MOD("cmt3", 913, R8A779H0_CLK_R),
192205
DEF_MOD("pfc0", 915, R8A779H0_CLK_CP),
193206
DEF_MOD("pfc1", 916, R8A779H0_CLK_CP),
194207
DEF_MOD("pfc2", 917, R8A779H0_CLK_CP),
208+
DEF_MOD("tsc2:tsc1", 919, R8A779H0_CLK_CL16M),
195209
};
196210

197211
/*

drivers/clk/renesas/r9a07g043-cpg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static const struct cpg_core_clk r9a07g043_core_clks[] __initconst = {
149149
#endif
150150
};
151151

152-
static struct rzg2l_mod_clk r9a07g043_mod_clks[] = {
152+
static const struct rzg2l_mod_clk r9a07g043_mod_clks[] = {
153153
#ifdef CONFIG_ARM64
154154
DEF_MOD("gic", R9A07G043_GIC600_GICCLK, R9A07G043_CLK_P1,
155155
0x514, 0),
@@ -282,7 +282,7 @@ static struct rzg2l_mod_clk r9a07g043_mod_clks[] = {
282282
0x5ac, 0),
283283
};
284284

285-
static struct rzg2l_reset r9a07g043_resets[] = {
285+
static const struct rzg2l_reset r9a07g043_resets[] = {
286286
#ifdef CONFIG_ARM64
287287
DEF_RST(R9A07G043_GIC600_GICRESET_N, 0x814, 0),
288288
DEF_RST(R9A07G043_GIC600_DBG_GICRESET_N, 0x814, 1),

drivers/clk/renesas/r9a07g044-cpg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static const struct {
368368
#endif
369369
};
370370

371-
static struct rzg2l_reset r9a07g044_resets[] = {
371+
static const struct rzg2l_reset r9a07g044_resets[] = {
372372
DEF_RST(R9A07G044_GIC600_GICRESET_N, 0x814, 0),
373373
DEF_RST(R9A07G044_GIC600_DBG_GICRESET_N, 0x814, 1),
374374
DEF_RST(R9A07G044_IA55_RESETN, 0x818, 0),

include/dt-bindings/clock/r9a07g043-cpg.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#define R9A07G043_CLK_SD0 5
1717
#define R9A07G043_CLK_SD1 6
1818
#define R9A07G043_CLK_M0 7
19-
#define R9A07G043_CLK_M2 8
20-
#define R9A07G043_CLK_M3 9
19+
#define R9A07G043_CLK_M2 8 /* RZ/G2UL Only */
20+
#define R9A07G043_CLK_M3 9 /* RZ/G2UL Only */
2121
#define R9A07G043_CLK_HP 10
2222
#define R9A07G043_CLK_TSU 11
2323
#define R9A07G043_CLK_ZT 12
2424
#define R9A07G043_CLK_P0 13
2525
#define R9A07G043_CLK_P1 14
2626
#define R9A07G043_CLK_P2 15
27-
#define R9A07G043_CLK_AT 16
27+
#define R9A07G043_CLK_AT 16 /* RZ/G2UL Only */
2828
#define R9A07G043_OSCCLK 17
2929
#define R9A07G043_CLK_P0_DIV2 18
3030

0 commit comments

Comments
 (0)