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

Merge tag 'renesas-drivers-for-v5.15-tag1' of... 

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

Renesas driver updates for v5.15

  - Initial support for the new R-Car H3e-2G and M3e-2G SoCs.

* tag 'renesas-drivers-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Identify R-Car H3e-2G and M3e-2G

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


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

drivers/soc/renesas/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ config ARCH_R8A77951 
	help

	  This enables support for the Renesas R-Car H3 SoC (revisions 2.0 and

	  later).

	  This includes different gradings like R-Car H3e-2G.



config ARCH_R8A77965

	bool "ARM64 Platform support for R-Car M3-N"
@@ -229,6 +230,7 @@ config ARCH_R8A77961 
	select SYSC_R8A77961

	help

	  This enables support for the Renesas R-Car M3-W+ SoC.

	  This includes different gradings like R-Car M3e-2G.



config ARCH_R8A77980

	bool "ARM64 Platform support for R-Car V3H"

drivers/soc/renesas/renesas-soc.c

+4 −0
Original line number Diff line number Diff line
@@ -284,11 +284,15 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)

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

#endif

#ifdef CONFIG_ARCH_R8A77951

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

#endif

#ifdef CONFIG_ARCH_R8A77960

	{ .compatible = "renesas,r8a7796",	.data = &soc_rcar_m3_w },

#endif

#ifdef CONFIG_ARCH_R8A77961

	{ .compatible = "renesas,r8a77961",	.data = &soc_rcar_m3_w },

	{ .compatible = "renesas,r8a779m3",	.data = &soc_rcar_m3_w },

#endif

#ifdef CONFIG_ARCH_R8A77965

	{ .compatible = "renesas,r8a77965",	.data = &soc_rcar_m3_n },