Commit dba4296b authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-renesas-for-v4.21-tag1' of... 

Merge tag 'clk-renesas-for-v4.21-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 support for SDHI and USB clocks on RZ/A2,
 - Add support for RPC (SPI Multi I/O Bus Controller) clocks on R-Car V3M.

* tag 'clk-renesas-for-v4.21-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: r7s9210: Add USB clocks
  clk: renesas: r8a77970: Add RPC clocks
  clk: renesas: r7s9210: Add SDHI clocks
parents 65102238 eb38c119

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

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ static const struct mssr_mod_clk r7s9210_mod_clks[] __initconst = { 
	DEF_MOD_STB("scif1",	 46,	R7S9210_CLK_P1C),

	DEF_MOD_STB("scif0",	 47,	R7S9210_CLK_P1C),



	DEF_MOD_STB("usb1",	 60,	R7S9210_CLK_B),

	DEF_MOD_STB("usb0",	 61,	R7S9210_CLK_B),

	DEF_MOD_STB("ether1",	 64,	R7S9210_CLK_B),

	DEF_MOD_STB("ether0",	 65,	R7S9210_CLK_B),
@@ -98,6 +100,11 @@ static const struct mssr_mod_clk r7s9210_mod_clks[] __initconst = { 
	DEF_MOD_STB("spi2",	 95,	R7S9210_CLK_P1),

	DEF_MOD_STB("spi1",	 96,	R7S9210_CLK_P1),

	DEF_MOD_STB("spi0",	 97,	R7S9210_CLK_P1),



	DEF_MOD_STB("sdhi11",	100,	R7S9210_CLK_B),

	DEF_MOD_STB("sdhi10",	101,	R7S9210_CLK_B),

	DEF_MOD_STB("sdhi01",	102,	R7S9210_CLK_B),

	DEF_MOD_STB("sdhi00",	103,	R7S9210_CLK_B),

};



/* The clock dividers in the table vary based on DT and register settings */

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

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ static const struct cpg_core_clk r8a77970_core_clks[] __initconst = { 
		 CLK_PLL1_DIV2),

	DEF_BASE("sd0",	R8A77970_CLK_SD0, CLK_TYPE_R8A77970_SD0, CLK_PLL1_DIV2),



	DEF_FIXED("rpc",	R8A77970_CLK_RPC,   CLK_PLL1_DIV2,  5, 1),

	DEF_FIXED("rpcd2",	R8A77970_CLK_RPCD2, CLK_PLL1_DIV2, 10, 1),



	DEF_FIXED("cl",		R8A77970_CLK_CL,    CLK_PLL1_DIV2, 48, 1),

	DEF_FIXED("cp",		R8A77970_CLK_CP,    CLK_EXTAL,	    2, 1),
@@ -152,6 +155,7 @@ static const struct mssr_mod_clk r8a77970_mod_clks[] __initconst = { 
	DEF_MOD("gpio1",		 911,	R8A77970_CLK_CP),

	DEF_MOD("gpio0",		 912,	R8A77970_CLK_CP),

	DEF_MOD("can-fd",		 914,	R8A77970_CLK_S2D2),

	DEF_MOD("rpc-if",		 917,	R8A77970_CLK_RPC),

	DEF_MOD("i2c4",			 927,	R8A77970_CLK_S2D2),

	DEF_MOD("i2c3",			 928,	R8A77970_CLK_S2D2),

	DEF_MOD("i2c2",			 929,	R8A77970_CLK_S2D2),

CRA Git | Maintained and supported by SUSTech CRA and CCSE