Commit 5f1fc972 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'renesas-clk-for-v5.15-tag1' of... 

Merge tag 'renesas-clk-for-v5.15-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 display (DU and DSI) clocks on R-Car V3U
 - Add I2C, DMAC, USB, sound (SSIF-2), GPIO, CANFD, and ADC clocks and
  resets on RZ/G2L
 - Miscellaneous fixes and improvements

* tag 'renesas-clk-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: r9a07g044: Add entry for fixed clock P0_DIV2
  dt-bindings: clock: r9a07g044-cpg: Add entry for P0_DIV2 core clock
  clk: renesas: r9a07g044: Add clock and reset entries for ADC
  clk: renesas: r9a07g044: Add clock and reset entries for CANFD
  clk: renesas: Rename renesas-rzg2l-cpg.[ch] to rzg2l-cpg.[ch]
  clk: renesas: r9a07g044: Add GPIO clock and reset entries
  clk: renesas: r9a07g044: Add SSIF-2 clock and reset entries
  clk: renesas: r9a07g044: Add USB clocks/resets
  clk: renesas: r9a07g044: Add DMAC clocks/resets
  clk: renesas: r9a07g044: Add I2C clocks/resets
  clk: renesas: r8a779a0: Add the DSI clocks
  clk: renesas: r8a779a0: Add the DU clock
  clk: renesas: rzg2: Rename i2c-dvfs to iic-pmic
  clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get()
  clk: renesas: rzg2l: Avoid mixing error pointers and NULL
  clk: renesas: rzg2l: Fix a double free on error
  clk: renesas: rzg2l: Fix return value and unused assignment
  clk: renesas: rzg2l: Remove unneeded semicolon
parents 2734d6c1 d28b1e03

drivers/clk/renesas/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ obj-$(CONFIG_CLK_RCAR_CPG_LIB) += rcar-cpg-lib.o 
obj-$(CONFIG_CLK_RCAR_GEN2_CPG)		+= rcar-gen2-cpg.o

obj-$(CONFIG_CLK_RCAR_GEN3_CPG)		+= rcar-gen3-cpg.o

obj-$(CONFIG_CLK_RCAR_USB2_CLOCK_SEL)	+= rcar-usb2-clock-sel.o

obj-$(CONFIG_CLK_RZG2L)			+= renesas-rzg2l-cpg.o

obj-$(CONFIG_CLK_RZG2L)			+= rzg2l-cpg.o



# Generic

obj-$(CONFIG_CLK_RENESAS_CPG_MSSR)	+= renesas-cpg-mssr.o

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = { 
	DEF_MOD("rpc-if",		 917,	R8A774A1_CLK_RPCD2),

	DEF_MOD("i2c6",			 918,	R8A774A1_CLK_S0D6),

	DEF_MOD("i2c5",			 919,	R8A774A1_CLK_S0D6),

	DEF_MOD("i2c-dvfs",		 926,	R8A774A1_CLK_CP),

	DEF_MOD("iic-pmic",		 926,	R8A774A1_CLK_CP),

	DEF_MOD("i2c4",			 927,	R8A774A1_CLK_S0D6),

	DEF_MOD("i2c3",			 928,	R8A774A1_CLK_S0D6),

	DEF_MOD("i2c2",			 929,	R8A774A1_CLK_S3D2),

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

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static const struct mssr_mod_clk r8a774b1_mod_clks[] __initconst = { 
	DEF_MOD("rpc-if",		 917,	R8A774B1_CLK_RPCD2),

	DEF_MOD("i2c6",			 918,	R8A774B1_CLK_S0D6),

	DEF_MOD("i2c5",			 919,	R8A774B1_CLK_S0D6),

	DEF_MOD("i2c-dvfs",		 926,	R8A774B1_CLK_CP),

	DEF_MOD("iic-pmic",		 926,	R8A774B1_CLK_CP),

	DEF_MOD("i2c4",			 927,	R8A774B1_CLK_S0D6),

	DEF_MOD("i2c3",			 928,	R8A774B1_CLK_S0D6),

	DEF_MOD("i2c2",			 929,	R8A774B1_CLK_S3D2),

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = { 
	DEF_MOD("rpc-if",		 917,	R8A774C0_CLK_RPCD2),

	DEF_MOD("i2c6",			 918,	R8A774C0_CLK_S3D2),

	DEF_MOD("i2c5",			 919,	R8A774C0_CLK_S3D2),

	DEF_MOD("i2c-dvfs",		 926,	R8A774C0_CLK_CP),

	DEF_MOD("iic-pmic",		 926,	R8A774C0_CLK_CP),

	DEF_MOD("i2c4",			 927,	R8A774C0_CLK_S3D2),

	DEF_MOD("i2c3",			 928,	R8A774C0_CLK_S3D2),

	DEF_MOD("i2c2",			 929,	R8A774C0_CLK_S3D2),

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

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static const struct mssr_mod_clk r8a774e1_mod_clks[] __initconst = { 
	DEF_MOD("i2c6",			 918,	R8A774E1_CLK_S0D6),

	DEF_MOD("i2c5",			 919,	R8A774E1_CLK_S0D6),

	DEF_MOD("adg",			 922,	R8A774E1_CLK_S0D1),

	DEF_MOD("i2c-dvfs",		 926,	R8A774E1_CLK_CP),

	DEF_MOD("iic-pmic",		 926,	R8A774E1_CLK_CP),

	DEF_MOD("i2c4",			 927,	R8A774E1_CLK_S0D6),

	DEF_MOD("i2c3",			 928,	R8A774E1_CLK_S0D6),

	DEF_MOD("i2c2",			 929,	R8A774E1_CLK_S3D2),