mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Renesas driver updates for v6.8 

- Remove duplicate setup of soc_device_attribute.family,
   - Make RZ/Five depend on !DMA_DIRECT_REMAP.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCZXwvsAAKCRCKwlD9ZEnx
 cDWuAQDWRMDKoc+WT/uZCp4tJyLjrdUUZOO3xLlJFtDdtC3cqAEAlrDOngrz/iAP
 MY/j11sNrSxOQokMSlLPBvS1HBWEZA0=
 =2VDI
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWFb4gACgkQYKtH/8kJ
 UiekGw//a8XxwykqqXUnqr2bLg/b7ZPf+LZrdED+/TRGkxItIDIjXkcAB/Utk/QO
 35b8WkwbAzQkGI1F8YIwX+V8pUSgNOuELTD5jPJqQeNxHkowdOVYjgApLLaP3Z5C
 LxDrnKGLgwfVvF+vgHpjB3PHAyuf+YFIz5Bu8I1Jug3vMyuqdIt4AlyWqpBWnx1O
 mWu20+5fIgBqUf/njPqJaFyQQh6ht2h1iJax8m3K4nm363cEDViwOmIH6d8FOi61
 TgxbilMEL1cWnOFH463VJqTWUt27ypZ6I4eVI0lgv+Rn2lEgfHXwoSGTbhsVFAGj
 jUgh+rwoxXuCdwE7tNJROWt1uji5NgsLDMO1B+XXcH0IL32cR0FEWkkDfXXUBnhH
 HJY/uwdBNIOk2By9BRbqvgakodgj/Y8eWXKqfCPA8qlWyhNEmBUr8UHqUwadXDW8
 hokPUfBhWcwvvfuXtug3nplOBsBGB4aXKgTGPdL67/bqeI35JqcyFUuc7m4J/NBF
 cfl0MVxF0Hi1J8kZTznyfI2UmDbWqlJ9nFHzq3afqs462s0JbUB3vVySqYEX+L7N
 LeA8aFJucgElT+1159wTYHFPXPBrs0Wk57LT9Y2xw5glBAKKHkypT/mif88V7woK
 hjjuOk00FeL4D/XccUjzS8FQPAHywUisfNjVhFqL73rkH0YTGeY=
 =ZiXg
 -----END PGP SIGNATURE-----

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

Renesas driver updates for v6.8

  - Remove duplicate setup of soc_device_attribute.family,
  - Make RZ/Five depend on !DMA_DIRECT_REMAP.

* tag 'renesas-drivers-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Make RZ/Five depend on !DMA_DIRECT_REMAP
  soc: renesas: Remove duplicate setup of soc_device_attribute.family

Link: https://lore.kernel.org/r/cover.1702642340.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-22 11:14:15 +00:00
parent e92c0b8b15 31b2daea07
commit 827601c40c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/soc/renesas/Kconfig
View File

@ -340,6 +340,7 @@ if RISCV
config ARCH_R9A07G043
bool "RISC-V Platform support for RZ/Five"
depends on NONPORTABLE
depends on !DMA_DIRECT_REMAP
depends on RISCV_ALTERNATIVE
depends on !RISCV_ISA_ZICBOM
depends on RISCV_SBI

4
drivers/soc/renesas/renesas-soc.c
View File

@ -486,10 +486,6 @@ static int __init renesas_soc_init(void)
return -ENOMEM;
}
np = of_find_node_by_path("/");
of_property_read_string(np, "model", &soc_dev_attr->machine);
of_node_put(np);
soc_dev_attr->family = kstrdup_const(family->name, GFP_KERNEL);
soc_dev_attr->soc_id = kstrdup_const(soc_id, GFP_KERNEL);