Commit 60c325a7 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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

Merge tag 'renesas-clk-for-v5.13-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 DAB hardware accelerator clocks on R-Car E3 and M3-N
 - Add timer (TMU) clocks on R-Car H3 ES1.0
 - Add Timer (TMU & CMT) and thermal sensor (TSC) clocks on R-Car V3U

* tag 'renesas-clk-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: r8a779a0: Add CMT clocks
  clk: renesas: r8a7795: Add TMU clocks
  clk: renesas: r8a779a0: Add TSC clock
  clk: renesas: r8a779a0: Add TMU clocks
  clk: renesas: r8a77965: Add DAB clock
  clk: renesas: r8a77990: Add DAB clock
parents a38fd874 0eedab65

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

+6 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { 
	DEF_MOD("fdp1-2",		 117,	R8A7795_CLK_S2D1), /* ES1.x */

	DEF_MOD("fdp1-1",		 118,	R8A7795_CLK_S0D1),

	DEF_MOD("fdp1-0",		 119,	R8A7795_CLK_S0D1),

	DEF_MOD("tmu4",			 121,	R8A7795_CLK_S0D6),

	DEF_MOD("tmu3",			 122,	R8A7795_CLK_S3D2),

	DEF_MOD("tmu2",			 123,	R8A7795_CLK_S3D2),

	DEF_MOD("tmu1",			 124,	R8A7795_CLK_S3D2),

	DEF_MOD("tmu0",			 125,	R8A7795_CLK_CP),

	DEF_MOD("scif5",		 202,	R8A7795_CLK_S3D4),

	DEF_MOD("scif4",		 203,	R8A7795_CLK_S3D4),

	DEF_MOD("scif3",		 204,	R8A7795_CLK_S3D4),
@@ -362,6 +367,7 @@ static const unsigned int r8a7795es1_mod_nullify[] __initconst = { 
static const struct mssr_mod_reparent r8a7795es1_mod_reparent[] __initconst = {

	{ MOD_CLK_ID(118), R8A7795_CLK_S2D1 },	/* FDP1-1 */

	{ MOD_CLK_ID(119), R8A7795_CLK_S2D1 },	/* FDP1-0 */

	{ MOD_CLK_ID(121), R8A7795_CLK_S3D2 },	/* TMU4 */

	{ MOD_CLK_ID(217), R8A7795_CLK_S3D1 },	/* SYS-DMAC2 */

	{ MOD_CLK_ID(218), R8A7795_CLK_S3D1 },	/* SYS-DMAC1 */

	{ MOD_CLK_ID(219), R8A7795_CLK_S3D1 },	/* SYS-DMAC0 */

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

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = { 
	DEF_MOD("ssi2",			1013,	MOD_CLK_ID(1005)),

	DEF_MOD("ssi1",			1014,	MOD_CLK_ID(1005)),

	DEF_MOD("ssi0",			1015,	MOD_CLK_ID(1005)),

	DEF_MOD("dab",			1016,	R8A77965_CLK_S0D6),

	DEF_MOD("scu-all",		1017,	R8A77965_CLK_S3D4),

	DEF_MOD("scu-dvc1",		1018,	MOD_CLK_ID(1017)),

	DEF_MOD("scu-dvc0",		1019,	MOD_CLK_ID(1017)),

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

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = { 
	DEF_MOD("ssi2",			1013,	MOD_CLK_ID(1005)),

	DEF_MOD("ssi1",			1014,	MOD_CLK_ID(1005)),

	DEF_MOD("ssi0",			1015,	MOD_CLK_ID(1005)),

	DEF_MOD("dab",			1016,	R8A77990_CLK_S3D1),

	DEF_MOD("scu-all",		1017,	R8A77990_CLK_S3D4),

	DEF_MOD("scu-dvc1",		1018,	MOD_CLK_ID(1017)),

	DEF_MOD("scu-dvc0",		1019,	MOD_CLK_ID(1017)),

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

+11 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static const struct cpg_core_clk r8a779a0_core_clks[] __initconst = { 
	DEF_FIXED("vcbus",	R8A779A0_CLK_VCBUS,	CLK_PLL5_DIV4,	1, 1),

	DEF_FIXED("cbfusa",	R8A779A0_CLK_CBFUSA,	CLK_EXTAL,	2, 1),

	DEF_FIXED("cp",		R8A779A0_CLK_CP,	CLK_EXTAL,	2, 1),

	DEF_FIXED("cl16mck",	R8A779A0_CLK_CL16MCK,	CLK_PLL1_DIV2,	64, 1),



	DEF_SD("sd0",		R8A779A0_CLK_SD0,	CLK_SDSRC,	0x870),
@@ -192,6 +193,11 @@ static const struct mssr_mod_clk r8a779a0_mod_clks[] __initconst = { 
	DEF_MOD("sdhi0",	706,	R8A779A0_CLK_SD0),

	DEF_MOD("sydm1",	709,	R8A779A0_CLK_S1D2),

	DEF_MOD("sydm2",	710,	R8A779A0_CLK_S1D2),

	DEF_MOD("tmu0",		713,	R8A779A0_CLK_CL16MCK),

	DEF_MOD("tmu1",		714,	R8A779A0_CLK_S1D4),

	DEF_MOD("tmu2",		715,	R8A779A0_CLK_S1D4),

	DEF_MOD("tmu3",		716,	R8A779A0_CLK_S1D4),

	DEF_MOD("tmu4",		717,	R8A779A0_CLK_S1D4),

	DEF_MOD("vin00",	730,	R8A779A0_CLK_S1D1),

	DEF_MOD("vin01",	731,	R8A779A0_CLK_S1D1),

	DEF_MOD("vin02",	800,	R8A779A0_CLK_S1D1),
@@ -227,10 +233,15 @@ static const struct mssr_mod_clk r8a779a0_mod_clks[] __initconst = { 
	DEF_MOD("vspd0",	830,	R8A779A0_CLK_S3D1),

	DEF_MOD("vspd1",	831,	R8A779A0_CLK_S3D1),

	DEF_MOD("rwdt",		907,	R8A779A0_CLK_R),

	DEF_MOD("cmt0",		910,	R8A779A0_CLK_R),

	DEF_MOD("cmt1",		911,	R8A779A0_CLK_R),

	DEF_MOD("cmt2",		912,	R8A779A0_CLK_R),

	DEF_MOD("cmt3",		913,	R8A779A0_CLK_R),

	DEF_MOD("pfc0",		915,	R8A779A0_CLK_CP),

	DEF_MOD("pfc1",		916,	R8A779A0_CLK_CP),

	DEF_MOD("pfc2",		917,	R8A779A0_CLK_CP),

	DEF_MOD("pfc3",		918,	R8A779A0_CLK_CP),

	DEF_MOD("tsc",		919,	R8A779A0_CLK_CL16MCK),

	DEF_MOD("vspx0",	1028,	R8A779A0_CLK_S1D1),

	DEF_MOD("vspx1",	1029,	R8A779A0_CLK_S1D1),

	DEF_MOD("vspx2",	1030,	R8A779A0_CLK_S1D1),