Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a4056a7 authored by Biju Das's avatar Biju Das Committed by Simon Horman
Browse files

soc: renesas: Identify RZ/G2M 



This patch adds support for identifying the RZ/G2M (r8a774a1) SoC.
It corrects the original RZ/G SoC family name to RZ/G1 and also
adds support for the new RZ/G2 SoC family.

Signed-off-by: default avatarBiju Das <biju.das@bp.renesas.com>
Reviewed-by: default avatarChris Paterson <chris.paterson2@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 5b394b2d

drivers/soc/renesas/renesas-soc.c

+20 −7
Original line number Diff line number Diff line
@@ -50,11 +50,16 @@ static const struct renesas_family fam_rza __initconst __maybe_unused = { 
	.name	= "RZ/A",

};



static const struct renesas_family fam_rzg __initconst __maybe_unused = {

	.name	= "RZ/G",

static const struct renesas_family fam_rzg1 __initconst __maybe_unused = {

	.name	= "RZ/G1",

	.reg	= 0xff000044,		/* PRR (Product Register) */

};



static const struct renesas_family fam_rzg2 __initconst __maybe_unused = {

	.name	= "RZ/G2",

	.reg	= 0xfff00044,		/* PRR (Product Register) */

};



static const struct renesas_family fam_shmobile __initconst __maybe_unused = {

	.name	= "SH-Mobile",

	.reg	= 0xe600101c,		/* CCCR (Common Chip Code Register) */
@@ -81,30 +86,35 @@ static const struct renesas_soc soc_rmobile_a1 __initconst __maybe_unused = { 
};



static const struct renesas_soc soc_rz_g1h __initconst __maybe_unused = {

	.family	= &fam_rzg,

	.family	= &fam_rzg1,

	.id	= 0x45,

};



static const struct renesas_soc soc_rz_g1m __initconst __maybe_unused = {

	.family	= &fam_rzg,

	.family	= &fam_rzg1,

	.id	= 0x47,

};



static const struct renesas_soc soc_rz_g1n __initconst __maybe_unused = {

	.family	= &fam_rzg,

	.family	= &fam_rzg1,

	.id	= 0x4b,

};



static const struct renesas_soc soc_rz_g1e __initconst __maybe_unused = {

	.family	= &fam_rzg,

	.family	= &fam_rzg1,

	.id	= 0x4c,

};



static const struct renesas_soc soc_rz_g1c __initconst __maybe_unused = {

	.family	= &fam_rzg,

	.family	= &fam_rzg1,

	.id	= 0x53,

};



static const struct renesas_soc soc_rz_g2m __initconst __maybe_unused = {

	.family	= &fam_rzg2,

	.id	= 0x52,

};



static const struct renesas_soc soc_rcar_m1a __initconst __maybe_unused = {

	.family	= &fam_rcar_gen1,

};
@@ -205,6 +215,9 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#ifdef CONFIG_ARCH_R8A77470

	{ .compatible = "renesas,r8a77470",	.data = &soc_rz_g1c },

#endif

#ifdef CONFIG_ARCH_R8A774A1

	{ .compatible = "renesas,r8a774a1",	.data = &soc_rz_g2m },

#endif

#ifdef CONFIG_ARCH_R8A7778

	{ .compatible = "renesas,r8a7778",	.data = &soc_rcar_m1a },

#endif