Commit 40745482 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Geert Uytterhoeven
Browse files

clk: renesas: r8a774c0: Add RPC clocks 



Describe the RPCSRC internal clock and the RPC[D2] clocks derived from it,
as well as the RPC-IF module clock, in the RZ/G2E (R8A774C0) CPG/MSSR
driver.

Add new clk type CLK_TYPE_GEN3_E3_RPCSRC to register rpcsrc as a fixed
clock on R-Car Gen3 E3 (and also RZ/G2E which is identical to E3 SoC),
parent and the divider is set based on the register value CPG_RPCCKCR[4:3]
which has been set prior to booting the kernel.

Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20201116101002.5986-1-prabhakar.mahadev-lad.rj@bp.renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 14653942

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

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum clk_ids { 
	CLK_S2,

	CLK_S3,

	CLK_SDSRC,

	CLK_RPCSRC,

	CLK_RINT,

	CLK_OCO,
@@ -74,6 +75,13 @@ static const struct cpg_core_clk r8a774c0_core_clks[] __initconst = { 
	DEF_FIXED(".s3",       CLK_S3,             CLK_PLL1,       6, 1),

	DEF_FIXED(".sdsrc",    CLK_SDSRC,          CLK_PLL1,       2, 1),



	DEF_FIXED_RPCSRC_E3(".rpcsrc", CLK_RPCSRC, CLK_PLL0, CLK_PLL1),



	DEF_BASE("rpc",		R8A774C0_CLK_RPC, CLK_TYPE_GEN3_RPC,

		 CLK_RPCSRC),

	DEF_BASE("rpcd2",	R8A774C0_CLK_RPCD2, CLK_TYPE_GEN3_RPCD2,

		 R8A774C0_CLK_RPC),



	DEF_DIV6_RO(".r",      CLK_RINT,           CLK_EXTAL, CPG_RCKCR, 32),



	DEF_RATE(".oco",       CLK_OCO,            8 * 1000 * 1000),
@@ -199,6 +207,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = { 
	DEF_MOD("can-fd",		 914,	R8A774C0_CLK_S3D2),

	DEF_MOD("can-if1",		 915,	R8A774C0_CLK_S3D4),

	DEF_MOD("can-if0",		 916,	R8A774C0_CLK_S3D4),

	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),

drivers/clk/renesas/rcar-gen3-cpg.c

+28 −0
Original line number Diff line number Diff line
@@ -695,6 +695,34 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev, 
						  cpg_rpcsrc_div_table,

						  &cpg_lock);



	case CLK_TYPE_GEN3_E3_RPCSRC:

		/*

		 * Register RPCSRC as fixed factor clock based on the

		 * MD[4:1] pins and CPG_RPCCKCR[4:3] register value for

		 * which has been set prior to booting the kernel.

		 */

		value = (readl(base + CPG_RPCCKCR) & GENMASK(4, 3)) >> 3;



		switch (value) {

		case 0:

			div = 5;

			break;

		case 1:

			div = 3;

			break;

		case 2:

			parent = clks[core->parent >> 16];

			if (IS_ERR(parent))

				return ERR_CAST(parent);

			div = core->div;

			break;

		case 3:

		default:

			div = 2;

			break;

		}

		break;



	case CLK_TYPE_GEN3_RPC:

		return cpg_rpc_clk_register(core->name, base,

					    __clk_get_name(parent), notifiers);

drivers/clk/renesas/rcar-gen3-cpg.h

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ enum rcar_gen3_clk_types { 
	CLK_TYPE_GEN3_OSC,	/* OSC EXTAL predivider and fixed divider */

	CLK_TYPE_GEN3_RCKSEL,	/* Select parent/divider using RCKCR.CKSEL */

	CLK_TYPE_GEN3_RPCSRC,

	CLK_TYPE_GEN3_E3_RPCSRC,

	CLK_TYPE_GEN3_RPC,

	CLK_TYPE_GEN3_RPCD2,
@@ -54,6 +55,10 @@ enum rcar_gen3_clk_types { 
#define DEF_GEN3_Z(_name, _id, _type, _parent, _div, _offset)	\

	DEF_BASE(_name, _id, _type, _parent, .div = _div, .offset = _offset)



#define DEF_FIXED_RPCSRC_E3(_name, _id, _parent0, _parent1)	\

	DEF_BASE(_name, _id, CLK_TYPE_GEN3_E3_RPCSRC,	\

		 (_parent0) << 16 | (_parent1), .div = 8)



struct rcar_gen3_cpg_pll_config {

	u8 extal_div;

	u8 pll1_mult;

CRA Git | Maintained and supported by SUSTech CRA and CCSE