Unverified Commit 61259f9e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Renesas driver updates for v5.16

  - Initial support for the new R-Car H3e, M3e, M3Ne(-2G), D3e, E3e, and
    H3Ne SoCs.

* tag 'renesas-drivers-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Identify more R-Car Gen3e SoCs

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5816b3e6 2ed1e481

drivers/soc/renesas/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ config ARCH_R8A77995 
	select SYSC_R8A77995

	help

	  This enables support for the Renesas R-Car D3 SoC.

	  This includes different gradings like R-Car D3e.



config ARCH_R8A77990

	bool "ARM64 Platform support for R-Car E3"
@@ -193,6 +194,7 @@ config ARCH_R8A77990 
	select SYSC_R8A77990

	help

	  This enables support for the Renesas R-Car E3 SoC.

	  This includes different gradings like R-Car E3e.



config ARCH_R8A77950

	bool "ARM64 Platform support for R-Car H3 ES1.x"
@@ -208,7 +210,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.

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



config ARCH_R8A77965

	bool "ARM64 Platform support for R-Car M3-N"
@@ -216,6 +218,7 @@ config ARCH_R8A77965 
	select SYSC_R8A77965

	help

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

	  This includes different gradings like R-Car M3Ne and M3Ne-2G.



config ARCH_R8A77960

	bool "ARM64 Platform support for R-Car M3-W"
@@ -230,7 +233,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.

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



config ARCH_R8A77980

	bool "ARM64 Platform support for R-Car V3H"

drivers/soc/renesas/renesas-soc.c

+7 −0
Original line number Diff line number Diff line
@@ -285,17 +285,22 @@ static const struct of_device_id renesas_socs[] __initconst = { 
	{ .compatible = "renesas,r8a7795",	.data = &soc_rcar_h3 },

#endif

#ifdef CONFIG_ARCH_R8A77951

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

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

	{ .compatible = "renesas,r8a779m8",	.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,r8a779m2",	.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 },

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

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

#endif

#ifdef CONFIG_ARCH_R8A77970

	{ .compatible = "renesas,r8a77970",	.data = &soc_rcar_v3m },
@@ -305,9 +310,11 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#endif

#ifdef CONFIG_ARCH_R8A77990

	{ .compatible = "renesas,r8a77990",	.data = &soc_rcar_e3 },

	{ .compatible = "renesas,r8a779m6",	.data = &soc_rcar_e3 },

#endif

#ifdef CONFIG_ARCH_R8A77995

	{ .compatible = "renesas,r8a77995",	.data = &soc_rcar_d3 },

	{ .compatible = "renesas,r8a779m7",	.data = &soc_rcar_d3 },

#endif

#ifdef CONFIG_ARCH_R8A779A0

	{ .compatible = "renesas,r8a779a0",	.data = &soc_rcar_v3u },