Skip to content

Commit a5ce1d5

Browse files
committed
Merge tag 'renesas-clk-for-v5.17-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 support for the new Renesas R-Car S4-8 (R8A779F0) SoC - Add GPU clock and resets on Renesas RZ/G2L - Miscellaneous fixes and improvements * tag 'renesas-clk-for-v5.17-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers: clk: renesas: r9a07g044: Add GPU clock and reset entries clk: renesas: r9a07g044: Add mux and divider for G clock clk: renesas: r9a07g044: Rename CLK_PLL3_DIV4 macro clk: renesas: cpg-mssr: Add support for R-Car S4-8 clk: renesas: rcar-gen4: Introduce R-Car Gen4 CPG driver dt-bindings: clock: Add r8a779f0 CPG Core Clock Definitions dt-bindings: power: Add r8a779f0 SYSC power domain definitions
2 parents 1dfeb03 + f0b62b0 commit a5ce1d5

File tree

12 files changed

+748
-343
lines changed

12 files changed

+748
-343
lines changed

drivers/clk/renesas/Kconfig

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ config CLK_RENESAS
3131
select CLK_R8A77990 if ARCH_R8A77990
3232
select CLK_R8A77995 if ARCH_R8A77995
3333
select CLK_R8A779A0 if ARCH_R8A779A0
34+
select CLK_R8A779F0 if ARCH_R8A779F0
3435
select CLK_R9A06G032 if ARCH_R9A06G032
3536
select CLK_R9A07G044 if ARCH_R9A07G044
3637
select CLK_SH73A0 if ARCH_SH73A0
@@ -149,8 +150,11 @@ config CLK_R8A77995
149150

150151
config CLK_R8A779A0
151152
bool "R-Car V3U clock support" if COMPILE_TEST
152-
select CLK_RCAR_CPG_LIB
153-
select CLK_RENESAS_CPG_MSSR
153+
select CLK_RCAR_GEN4_CPG
154+
155+
config CLK_R8A779F0
156+
bool "R-Car S4-8 clock support" if COMPILE_TEST
157+
select CLK_RCAR_GEN4_CPG
154158

155159
config CLK_R9A06G032
156160
bool "RZ/N1D clock support" if COMPILE_TEST
@@ -178,6 +182,11 @@ config CLK_RCAR_GEN3_CPG
178182
select CLK_RCAR_CPG_LIB
179183
select CLK_RENESAS_CPG_MSSR
180184

185+
config CLK_RCAR_GEN4_CPG
186+
bool "R-Car Gen4 clock support" if COMPILE_TEST
187+
select CLK_RCAR_CPG_LIB
188+
select CLK_RENESAS_CPG_MSSR
189+
181190
config CLK_RCAR_USB2_CLOCK_SEL
182191
bool "Renesas R-Car USB2 clock selector support"
183192
depends on ARCH_RENESAS || COMPILE_TEST

drivers/clk/renesas/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ obj-$(CONFIG_CLK_R8A77980) += r8a77980-cpg-mssr.o
2828
obj-$(CONFIG_CLK_R8A77990) += r8a77990-cpg-mssr.o
2929
obj-$(CONFIG_CLK_R8A77995) += r8a77995-cpg-mssr.o
3030
obj-$(CONFIG_CLK_R8A779A0) += r8a779a0-cpg-mssr.o
31+
obj-$(CONFIG_CLK_R8A779F0) += r8a779f0-cpg-mssr.o
3132
obj-$(CONFIG_CLK_R9A06G032) += r9a06g032-clocks.o
3233
obj-$(CONFIG_CLK_R9A07G044) += r9a07g044-cpg.o
3334
obj-$(CONFIG_CLK_SH73A0) += clk-sh73a0.o
@@ -36,6 +37,7 @@ obj-$(CONFIG_CLK_SH73A0) += clk-sh73a0.o
3637
obj-$(CONFIG_CLK_RCAR_CPG_LIB) += rcar-cpg-lib.o
3738
obj-$(CONFIG_CLK_RCAR_GEN2_CPG) += rcar-gen2-cpg.o
3839
obj-$(CONFIG_CLK_RCAR_GEN3_CPG) += rcar-gen3-cpg.o
40+
obj-$(CONFIG_CLK_RCAR_GEN4_CPG) += rcar-gen4-cpg.o
3941
obj-$(CONFIG_CLK_RCAR_USB2_CLOCK_SEL) += rcar-usb2-clock-sel.o
4042
obj-$(CONFIG_CLK_RZG2L) += rzg2l-cpg.o
4143

0 commit comments

Comments
 (0)