mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

Renesas driver updates for v6.7

Browse source 
- Identify the new RZ/G3S SoC,
   - Miscellaneous fixes and improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iHQEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCZRaddgAKCRCKwlD9ZEnx
 cOWxAPivleHtCGxs8+tKDNiV3g1RFpaNBvnAc2FIjf4v/akOAQChbpG/OjJcpbai
 dbrpoui3P/WYhr+adOWqgpInXMqNCw==
 =vYub
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUtomQACgkQYKtH/8kJ
 UieYbw/+N0osLgv9GRo7nUgci+6Te6RthCdrXsDPnay/LQM7rYego8xzGySdXbZ0
 qef4aDAKI4rEPWU2XC1edNfmt11YUbicBVWiKv/3p2784kKwG9UFXBJ/bYZim1mY
 /hRdDul3J1LlbyM9Eauo8VZn7PMfo1buX3q3011dlIFJwBdZBA7fLXFf8q9DF6Qd
 3Yp3+WjPX3B1yxHzGzj34S9ChuimrXDFLqPjjGlyEjnpmbcroYcbboMIUcLC5BfO
 WKSh+G/rjN4zaUiuyImzH/9o0n/A5omtbnqZD+eRGOlmkX9bNP3rAYGOVVFxuJRz
 16Pb8qBPMG6l8JO/kO1rUjxoLCVHTg+eO//STJ3h81Lqd6W1yC+BFvWWWHUuX40Q
 q5m0Vnhwjuv9XbAg6auKvpjz5wUzxPHXz7Hix4CzvGqvpkr5RSFwrfUH2x+U0CN5
 Qgor6PSbrLp1G8y4BDykFAPYbgMm976VQmSkn6yJmKj51MdcJ4ktNZbAof1MpJMt
 LWQ//FXbwajcaUxzfDMW6elaso1yU038KANqjAp6itfNpsccP8xhNYhZ58wY6Srd
 wQtE/8FKyq6i0xGxaDfC8ORYcEXD8mBcda5ItjcQE4VRor2tt+jWSNcTyhjzP55C
 7n+N+iN+z5rLUFgtZLyfOYjue2KrDkNgNJS9p+kwu4IXvTKPd0w=
 =yAwA
 -----END PGP SIGNATURE-----

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

Renesas driver updates for v6.7

  - Identify the new RZ/G3S SoC,
  - Miscellaneous fixes and improvements.

* tag 'renesas-drivers-for-v6.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Kconfig: Remove blank line before ARCH_R9A07G043 help text
  soc: renesas: renesas-soc: Remove blank lines
  soc: renesas: Identify RZ/G3S SoC

Link: https://lore.kernel.org/r/cover.1695985423.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-16 22:51:48 +02:00
commit 8c15065cdd
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/soc/renesas/Kconfig
View file

@ -319,6 +319,12 @@ config ARCH_R9A07G054
help
This enables support for the Renesas RZ/V2L SoC variants.
config ARCH_R9A08G045
bool "ARM64 Platform support for RZ/G3S"
select ARCH_RZG2L
help
This enables support for the Renesas RZ/G3S SoC variants.
config ARCH_R9A09G011
bool "ARM64 Platform support for RZ/V2M"
select PM
@ -338,7 +344,6 @@ config ARCH_R9A07G043
select DMA_GLOBAL_POOL
select ERRATA_ANDES if RISCV_SBI
select ERRATA_ANDES_CMO if ERRATA_ANDES
help
This enables support for the Renesas RZ/Five SoC.

15
drivers/soc/renesas/renesas-soc.c
View file

@ -12,7 +12,6 @@
#include <linux/string.h>
#include <linux/sys_soc.h>
struct renesas_family {
const char name[16];
u32 reg; /* CCCR or PRR, if not in DT */
@ -72,6 +71,10 @@ static const struct renesas_family fam_rzg2ul __initconst __maybe_unused = {
.name = "RZ/G2UL",
};
static const struct renesas_family fam_rzg3s __initconst __maybe_unused = {
.name = "RZ/G3S",
};
static const struct renesas_family fam_rzv2l __initconst __maybe_unused = {
.name = "RZ/V2L",
};
@ -85,7 +88,6 @@ static const struct renesas_family fam_shmobile __initconst __maybe_unused = {
.reg = 0xe600101c, /* CCCR (Common Chip Code Register) */
};
struct renesas_soc {
const struct renesas_family *family;
u32 id;
@ -170,6 +172,11 @@ static const struct renesas_soc soc_rz_g2ul __initconst __maybe_unused = {
.id = 0x8450447,
};
static const struct renesas_soc soc_rz_g3s __initconst __maybe_unused = {
.family = &fam_rzg3s,
.id = 0x85e0447,
};
static const struct renesas_soc soc_rz_v2l __initconst __maybe_unused = {
.family = &fam_rzv2l,
.id = 0x8447447,
@ -386,6 +393,9 @@ static const struct of_device_id renesas_socs[] __initconst __maybe_unused = {
#ifdef CONFIG_ARCH_R9A07G054
{ .compatible = "renesas,r9a07g054", .data = &soc_rz_v2l },
#endif
#ifdef CONFIG_ARCH_R9A08G045
{ .compatible = "renesas,r9a08g045", .data = &soc_rz_g3s },
#endif
#ifdef CONFIG_ARCH_R9A09G011
{ .compatible = "renesas,r9a09g011", .data = &soc_rz_v2m },
#endif
@ -429,6 +439,7 @@ static const struct of_device_id renesas_ids[] __initconst = {
{ .compatible = "renesas,r9a07g043-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a07g044-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a07g054-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a08g045-sysc", .data = &id_rzg2l },
{ .compatible = "renesas,r9a09g011-sys", .data = &id_rzv2m },
{ .compatible = "renesas,prr", .data = &id_prr },
{ /* sentinel */ }