Unverified Commit c9a2577d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v6.1-tag1' of... 

Merge tag 'renesas-drivers-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v6.1

  - Auto-enable the RZ/G2L external and GPIO interrupt controller driver
    when needed,
  - Identify the R-Car H3Ne-1.7G and RZ/Five SoCs.

* tag 'renesas-drivers-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Identify RZ/Five SoC
  soc: renesas: Identify R-Car H3Ne-1.7G
  soc: renesas: Kconfig: Enable IRQC driver for RZ/G2L SoC

Link: https://lore.kernel.org/r/cover.1662111135.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b90cb105 ebd0e06f

drivers/soc/renesas/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ config ARCH_RZG2L 
	bool

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_RZG2L_IRQC



config ARCH_RZN1

	bool
@@ -332,6 +333,16 @@ config ARCH_R9A09G011 


endif # ARM64



if RISCV



config ARCH_R9A07G043

	bool "RISC-V Platform support for RZ/Five"

	select ARCH_RZG2L

	help

	  This enables support for the Renesas RZ/Five SoC.



endif # RISCV



config RST_RCAR

	bool "Reset Controller support for R-Car" if COMPILE_TEST

drivers/soc/renesas/renesas-soc.c

+14 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ static const struct renesas_family fam_rza2 __initconst __maybe_unused = { 
	.name	= "RZ/A2",

};



static const struct renesas_family fam_rzfive __initconst __maybe_unused = {

	.name	= "RZ/Five",

};



static const struct renesas_family fam_rzg1 __initconst __maybe_unused = {

	.name	= "RZ/G1",

	.reg	= 0xff000044,		/* PRR (Product Register) */
@@ -102,6 +106,11 @@ static const struct renesas_soc soc_rmobile_a1 __initconst __maybe_unused = { 
	.id	= 0x40,

};



static const struct renesas_soc soc_rz_five __initconst __maybe_unused = {

	.family = &fam_rzfive,

	.id     = 0x847c447,

};



static const struct renesas_soc soc_rz_g1h __initconst __maybe_unused = {

	.family	= &fam_rzg1,

	.id	= 0x45,
@@ -320,6 +329,7 @@ static const struct of_device_id renesas_socs[] __initconst = { 
	{ .compatible = "renesas,r8a779m0",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779m1",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779m8",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779mb",	.data = &soc_rcar_h3 },

#endif

#ifdef CONFIG_ARCH_R8A77960

	{ .compatible = "renesas,r8a7796",	.data = &soc_rcar_m3_w },
@@ -358,8 +368,12 @@ static const struct of_device_id renesas_socs[] __initconst = { 
	{ .compatible = "renesas,r8a779g0",	.data = &soc_rcar_v4h },

#endif

#if defined(CONFIG_ARCH_R9A07G043)

#ifdef CONFIG_RISCV

	{ .compatible = "renesas,r9a07g043",	.data = &soc_rz_five },

#else

	{ .compatible = "renesas,r9a07g043",	.data = &soc_rz_g2ul },

#endif

#endif

#if defined(CONFIG_ARCH_R9A07G044)

	{ .compatible = "renesas,r9a07g044",	.data = &soc_rz_g2l },

#endif