Skip to content

Commit 4d69529

Browse files
Fabrizio Castrogeertu
authored andcommitted
clk: renesas: r9a09g057: Add entries for the DMACs
Add clock and reset entries for the Renesas RZ/V2H(P) DMAC IPs. Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/20250220150110.738619-2-fabrizio.castro.jz@renesas.com Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
1 parent 9b12504 commit 4d69529

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

drivers/clk/renesas/r9a09g057-cpg.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ enum clk_ids {
3131
CLK_PLLVDO,
3232

3333
/* Internal Core Clocks */
34+
CLK_PLLCM33_DIV4,
35+
CLK_PLLCM33_DIV4_PLLCM33,
3436
CLK_PLLCM33_DIV16,
3537
CLK_PLLCLN_DIV2,
3638
CLK_PLLCLN_DIV8,
@@ -39,6 +41,8 @@ enum clk_ids {
3941
CLK_PLLDTY_ACPU_DIV2,
4042
CLK_PLLDTY_ACPU_DIV4,
4143
CLK_PLLDTY_DIV16,
44+
CLK_PLLDTY_RCPU,
45+
CLK_PLLDTY_RCPU_DIV4,
4246
CLK_PLLVDO_CRU0,
4347
CLK_PLLVDO_CRU1,
4448
CLK_PLLVDO_CRU2,
@@ -85,6 +89,9 @@ static const struct cpg_core_clk r9a09g057_core_clks[] __initconst = {
8589
DEF_FIXED(".pllvdo", CLK_PLLVDO, CLK_QEXTAL, 105, 2),
8690

8791
/* Internal Core Clocks */
92+
DEF_FIXED(".pllcm33_div4", CLK_PLLCM33_DIV4, CLK_PLLCM33, 1, 4),
93+
DEF_DDIV(".pllcm33_div4_pllcm33", CLK_PLLCM33_DIV4_PLLCM33,
94+
CLK_PLLCM33_DIV4, CDDIV0_DIVCTL1, dtable_2_64),
8895
DEF_FIXED(".pllcm33_div16", CLK_PLLCM33_DIV16, CLK_PLLCM33, 1, 16),
8996

9097
DEF_FIXED(".pllcln_div2", CLK_PLLCLN_DIV2, CLK_PLLCLN, 1, 2),
@@ -95,6 +102,8 @@ static const struct cpg_core_clk r9a09g057_core_clks[] __initconst = {
95102
DEF_FIXED(".plldty_acpu_div2", CLK_PLLDTY_ACPU_DIV2, CLK_PLLDTY_ACPU, 1, 2),
96103
DEF_FIXED(".plldty_acpu_div4", CLK_PLLDTY_ACPU_DIV4, CLK_PLLDTY_ACPU, 1, 4),
97104
DEF_FIXED(".plldty_div16", CLK_PLLDTY_DIV16, CLK_PLLDTY, 1, 16),
105+
DEF_DDIV(".plldty_rcpu", CLK_PLLDTY_RCPU, CLK_PLLDTY, CDDIV3_DIVCTL2, dtable_2_64),
106+
DEF_FIXED(".plldty_rcpu_div4", CLK_PLLDTY_RCPU_DIV4, CLK_PLLDTY_RCPU, 1, 4),
98107

99108
DEF_DDIV(".pllvdo_cru0", CLK_PLLVDO_CRU0, CLK_PLLVDO, CDDIV3_DIVCTL3, dtable_2_4),
100109
DEF_DDIV(".pllvdo_cru1", CLK_PLLVDO_CRU1, CLK_PLLVDO, CDDIV4_DIVCTL0, dtable_2_4),
@@ -115,6 +124,16 @@ static const struct cpg_core_clk r9a09g057_core_clks[] __initconst = {
115124
};
116125

117126
static const struct rzv2h_mod_clk r9a09g057_mod_clks[] __initconst = {
127+
DEF_MOD("dmac_0_aclk", CLK_PLLCM33_DIV4_PLLCM33, 0, 0, 0, 0,
128+
BUS_MSTOP(5, BIT(9))),
129+
DEF_MOD("dmac_1_aclk", CLK_PLLDTY_ACPU_DIV2, 0, 1, 0, 1,
130+
BUS_MSTOP(3, BIT(2))),
131+
DEF_MOD("dmac_2_aclk", CLK_PLLDTY_ACPU_DIV2, 0, 2, 0, 2,
132+
BUS_MSTOP(3, BIT(3))),
133+
DEF_MOD("dmac_3_aclk", CLK_PLLDTY_RCPU_DIV4, 0, 3, 0, 3,
134+
BUS_MSTOP(10, BIT(11))),
135+
DEF_MOD("dmac_4_aclk", CLK_PLLDTY_RCPU_DIV4, 0, 4, 0, 4,
136+
BUS_MSTOP(10, BIT(12))),
118137
DEF_MOD_CRITICAL("icu_0_pclk_i", CLK_PLLCM33_DIV16, 0, 5, 0, 5,
119138
BUS_MSTOP_NONE),
120139
DEF_MOD_CRITICAL("gic_0_gicclk", CLK_PLLDTY_ACPU_DIV4, 1, 3, 0, 19,
@@ -223,6 +242,11 @@ static const struct rzv2h_mod_clk r9a09g057_mod_clks[] __initconst = {
223242

224243
static const struct rzv2h_reset r9a09g057_resets[] __initconst = {
225244
DEF_RST(3, 0, 1, 1), /* SYS_0_PRESETN */
245+
DEF_RST(3, 1, 1, 2), /* DMAC_0_ARESETN */
246+
DEF_RST(3, 2, 1, 3), /* DMAC_1_ARESETN */
247+
DEF_RST(3, 3, 1, 4), /* DMAC_2_ARESETN */
248+
DEF_RST(3, 4, 1, 5), /* DMAC_3_ARESETN */
249+
DEF_RST(3, 5, 1, 6), /* DMAC_4_ARESETN */
226250
DEF_RST(3, 6, 1, 7), /* ICU_0_PRESETN_I */
227251
DEF_RST(3, 8, 1, 9), /* GIC_0_GICRESET_N */
228252
DEF_RST(3, 9, 1, 10), /* GIC_0_DBG_GICRESET_N */

drivers/clk/renesas/rzv2h-cpg.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ struct ddiv {
3838
#define CPG_CDDIV3 (0x40C)
3939
#define CPG_CDDIV4 (0x410)
4040

41+
#define CDDIV0_DIVCTL1 DDIV_PACK(CPG_CDDIV0, 4, 3, 1)
4142
#define CDDIV0_DIVCTL2 DDIV_PACK(CPG_CDDIV0, 8, 3, 2)
4243
#define CDDIV1_DIVCTL0 DDIV_PACK(CPG_CDDIV1, 0, 2, 4)
4344
#define CDDIV1_DIVCTL1 DDIV_PACK(CPG_CDDIV1, 4, 2, 5)
4445
#define CDDIV1_DIVCTL2 DDIV_PACK(CPG_CDDIV1, 8, 2, 6)
4546
#define CDDIV1_DIVCTL3 DDIV_PACK(CPG_CDDIV1, 12, 2, 7)
47+
#define CDDIV3_DIVCTL2 DDIV_PACK(CPG_CDDIV3, 8, 3, 14)
4648
#define CDDIV3_DIVCTL3 DDIV_PACK(CPG_CDDIV3, 12, 1, 15)
4749
#define CDDIV4_DIVCTL0 DDIV_PACK(CPG_CDDIV4, 0, 1, 16)
4850
#define CDDIV4_DIVCTL1 DDIV_PACK(CPG_CDDIV4, 4, 1, 17)

0 commit comments

Comments
 (0)