Skip to content

Commit 80a6359

Browse files
committed
Merge tag 'renesas-clk-for-v5.18-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 DMA engine (SYS-DMAC) clocks on Renesas R-Car S4-8 - Add MOST (MediaLB I/F) clocks on Renesas R-Car E3 and D3 - Add CAN-FD clocks on Renesas R-Car V3U - Add support for the new Renesas RZ/V2L SoC - Miscellaneous fixes and improvements * tag 'renesas-clk-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: rzg2l-cpg: Add support for RZ/V2L SoC dt-bindings: clock: renesas: Document RZ/V2L SoC dt-bindings: clock: Add R9A07G054 CPG Clock and Reset Definitions clk: renesas: r8a779a0: Add CANFD module clock clk: renesas: r9a07g044: Update multiplier and divider values for PLL2/3 clk: renesas: r8a7799[05]: Add MLP clocks clk: renesas: r8a779f0: Add SYS-DMAC clocks
2 parents e783362 + a1bcf50 commit 80a6359

File tree

11 files changed

+492
-197
lines changed

11 files changed

+492
-197
lines changed

Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
$id: "http://devicetree.org/schemas/clock/renesas,rzg2l-cpg.yaml#"
55
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
66

7-
title: Renesas RZ/G2L Clock Pulse Generator / Module Standby Mode
7+
title: Renesas RZ/{G2L,V2L} Clock Pulse Generator / Module Standby Mode
88

99
maintainers:
1010
- Geert Uytterhoeven <geert+renesas@glider.be>
1111

1212
description: |
13-
On Renesas RZ/G2L SoC, the CPG (Clock Pulse Generator) and Module
13+
On Renesas RZ/{G2L,V2L} SoC, the CPG (Clock Pulse Generator) and Module
1414
Standby Mode share the same register block.
1515
1616
They provide the following functionalities:
@@ -22,7 +22,9 @@ description: |
2222
2323
properties:
2424
compatible:
25-
const: renesas,r9a07g044-cpg # RZ/G2{L,LC}
25+
enum:
26+
- renesas,r9a07g044-cpg # RZ/G2{L,LC}
27+
- renesas,r9a07g054-cpg # RZ/V2L
2628

2729
reg:
2830
maxItems: 1
@@ -40,9 +42,9 @@ properties:
4042
description: |
4143
- For CPG core clocks, the two clock specifier cells must be "CPG_CORE"
4244
and a core clock reference, as defined in
43-
<dt-bindings/clock/r9a07g044-cpg.h>
45+
<dt-bindings/clock/r9a07g*-cpg.h>
4446
- For module clocks, the two clock specifier cells must be "CPG_MOD" and
45-
a module number, as defined in the <dt-bindings/clock/r9a07g044-cpg.h>.
47+
a module number, as defined in the <dt-bindings/clock/r9a07g0*-cpg.h>.
4648
const: 2
4749

4850
'#power-domain-cells':
@@ -56,7 +58,7 @@ properties:
5658
'#reset-cells':
5759
description:
5860
The single reset specifier cell must be the module number, as defined in
59-
the <dt-bindings/clock/r9a07g044-cpg.h>.
61+
the <dt-bindings/clock/r9a07g0*-cpg.h>.
6062
const: 1
6163

6264
required:

drivers/clk/renesas/Kconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ config CLK_RENESAS
3434
select CLK_R8A779F0 if ARCH_R8A779F0
3535
select CLK_R9A06G032 if ARCH_R9A06G032
3636
select CLK_R9A07G044 if ARCH_R9A07G044
37+
select CLK_R9A07G054 if ARCH_R9A07G054
3738
select CLK_SH73A0 if ARCH_SH73A0
3839

3940
if CLK_RENESAS
@@ -163,6 +164,10 @@ config CLK_R9A07G044
163164
bool "RZ/G2L clock support" if COMPILE_TEST
164165
select CLK_RZG2L
165166

167+
config CLK_R9A07G054
168+
bool "RZ/V2L clock support" if COMPILE_TEST
169+
select CLK_RZG2L
170+
166171
config CLK_SH73A0
167172
bool "SH-Mobile AG5 clock support" if COMPILE_TEST
168173
select CLK_RENESAS_CPG_MSTP
@@ -195,7 +200,7 @@ config CLK_RCAR_USB2_CLOCK_SEL
195200
This is a driver for R-Car USB2 clock selector
196201

197202
config CLK_RZG2L
198-
bool "Renesas RZ/G2L family clock support" if COMPILE_TEST
203+
bool "Renesas RZ/{G2L,V2L} family clock support" if COMPILE_TEST
199204
select RESET_CONTROLLER
200205

201206
# Generic

drivers/clk/renesas/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ obj-$(CONFIG_CLK_R8A779A0) += r8a779a0-cpg-mssr.o
3131
obj-$(CONFIG_CLK_R8A779F0) += r8a779f0-cpg-mssr.o
3232
obj-$(CONFIG_CLK_R9A06G032) += r9a06g032-clocks.o
3333
obj-$(CONFIG_CLK_R9A07G044) += r9a07g044-cpg.o
34+
obj-$(CONFIG_CLK_R9A07G054) += r9a07g044-cpg.o
3435
obj-$(CONFIG_CLK_SH73A0) += clk-sh73a0.o
3536

3637
# Family

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = {
200200
DEF_MOD("du0", 724, R8A77990_CLK_S1D1),
201201
DEF_MOD("lvds", 727, R8A77990_CLK_S2D1),
202202

203+
DEF_MOD("mlp", 802, R8A77990_CLK_S2D1),
203204
DEF_MOD("vin5", 806, R8A77990_CLK_S1D2),
204205
DEF_MOD("vin4", 807, R8A77990_CLK_S1D2),
205206
DEF_MOD("etheravb", 812, R8A77990_CLK_S3D2),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] __initconst = {
160160
DEF_MOD("du1", 723, R8A77995_CLK_S1D1),
161161
DEF_MOD("du0", 724, R8A77995_CLK_S1D1),
162162
DEF_MOD("lvds", 727, R8A77995_CLK_S2D1),
163+
DEF_MOD("mlp", 802, R8A77995_CLK_S2D1),
163164
DEF_MOD("vin4", 807, R8A77995_CLK_S1D2),
164165
DEF_MOD("etheravb", 812, R8A77995_CLK_S3D2),
165166
DEF_MOD("imr0", 823, R8A77995_CLK_S1D2),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ static const struct mssr_mod_clk r8a779a0_mod_clks[] __initconst = {
136136
DEF_MOD("avb3", 214, R8A779A0_CLK_S3D2),
137137
DEF_MOD("avb4", 215, R8A779A0_CLK_S3D2),
138138
DEF_MOD("avb5", 216, R8A779A0_CLK_S3D2),
139+
DEF_MOD("canfd0", 328, R8A779A0_CLK_CANFD),
139140
DEF_MOD("csi40", 331, R8A779A0_CLK_CSI0),
140141
DEF_MOD("csi41", 400, R8A779A0_CLK_CSI0),
141142
DEF_MOD("csi42", 401, R8A779A0_CLK_CSI0),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {
119119
DEF_MOD("scif1", 703, R8A779F0_CLK_S0D12_PER),
120120
DEF_MOD("scif3", 704, R8A779F0_CLK_S0D12_PER),
121121
DEF_MOD("scif4", 705, R8A779F0_CLK_S0D12_PER),
122+
DEF_MOD("sys-dmac0", 709, R8A779F0_CLK_S0D3_PER),
123+
DEF_MOD("sys-dmac1", 710, R8A779F0_CLK_S0D3_PER),
122124
};
123125

124126
/*

0 commit comments

Comments
 (0)