Commit 44745569 authored by Arnd Bergmann's avatar Arnd Bergmann

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

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

Renesas driver updates for v5.19

  - Initial support for the new RZ/G2UL SoC.

* tag 'renesas-drivers-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Identify RZ/G2UL SoC

Link: https://lore.kernel.org/r/cover.1650638515.git.geert+renesas@glider.beSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b8e3d15e 2f89bef9
...@@ -296,6 +296,12 @@ config ARCH_R8A774B1 ...@@ -296,6 +296,12 @@ config ARCH_R8A774B1
help help
This enables support for the Renesas RZ/G2N SoC. This enables support for the Renesas RZ/G2N SoC.
config ARCH_R9A07G043
bool "ARM64 Platform support for RZ/G2UL"
select ARCH_RZG2L
help
This enables support for the Renesas RZ/G2UL SoC variants.
config ARCH_R9A07G044 config ARCH_R9A07G044
bool "ARM64 Platform support for RZ/G2L" bool "ARM64 Platform support for RZ/G2L"
select ARCH_RZG2L select ARCH_RZG2L
......
...@@ -64,6 +64,10 @@ static const struct renesas_family fam_rzg2l __initconst __maybe_unused = { ...@@ -64,6 +64,10 @@ static const struct renesas_family fam_rzg2l __initconst __maybe_unused = {
.name = "RZ/G2L", .name = "RZ/G2L",
}; };
static const struct renesas_family fam_rzg2ul __initconst __maybe_unused = {
.name = "RZ/G2UL",
};
static const struct renesas_family fam_rzv2l __initconst __maybe_unused = { static const struct renesas_family fam_rzv2l __initconst __maybe_unused = {
.name = "RZ/V2L", .name = "RZ/V2L",
}; };
...@@ -148,6 +152,11 @@ static const struct renesas_soc soc_rz_g2l __initconst __maybe_unused = { ...@@ -148,6 +152,11 @@ static const struct renesas_soc soc_rz_g2l __initconst __maybe_unused = {
.id = 0x841c447, .id = 0x841c447,
}; };
static const struct renesas_soc soc_rz_g2ul __initconst __maybe_unused = {
.family = &fam_rzg2ul,
.id = 0x8450447,
};
static const struct renesas_soc soc_rz_v2l __initconst __maybe_unused = { static const struct renesas_soc soc_rz_v2l __initconst __maybe_unused = {
.family = &fam_rzv2l, .family = &fam_rzv2l,
.id = 0x8447447, .id = 0x8447447,
...@@ -340,6 +349,9 @@ static const struct of_device_id renesas_socs[] __initconst = { ...@@ -340,6 +349,9 @@ static const struct of_device_id renesas_socs[] __initconst = {
#ifdef CONFIG_ARCH_R8A779F0 #ifdef CONFIG_ARCH_R8A779F0
{ .compatible = "renesas,r8a779f0", .data = &soc_rcar_s4 }, { .compatible = "renesas,r8a779f0", .data = &soc_rcar_s4 },
#endif #endif
#if defined(CONFIG_ARCH_R9A07G043)
{ .compatible = "renesas,r9a07g043", .data = &soc_rz_g2ul },
#endif
#if defined(CONFIG_ARCH_R9A07G044) #if defined(CONFIG_ARCH_R9A07G044)
{ .compatible = "renesas,r9a07g044", .data = &soc_rz_g2l }, { .compatible = "renesas,r9a07g044", .data = &soc_rz_g2l },
#endif #endif
...@@ -378,6 +390,7 @@ static const struct renesas_id id_prr __initconst = { ...@@ -378,6 +390,7 @@ static const struct renesas_id id_prr __initconst = {
static const struct of_device_id renesas_ids[] __initconst = { static const struct of_device_id renesas_ids[] __initconst = {
{ .compatible = "renesas,bsid", .data = &id_bsid }, { .compatible = "renesas,bsid", .data = &id_bsid },
{ .compatible = "renesas,r9a07g043-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a07g044-sysc", .data = &id_rzg2l }, { .compatible = "renesas,r9a07g044-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a07g054-sysc", .data = &id_rzg2l }, { .compatible = "renesas,r9a07g054-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,prr", .data = &id_prr }, { .compatible = "renesas,prr", .data = &id_prr },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment