mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-12 04:48:13 -04:00
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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 },
|
||||
|
||||
Reference in New Issue
Block a user