Renesas driver updates for v5.7

- Miscellaneous fixes and improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCXlZEAAAKCRCKwlD9ZEnx
 cH6PAQD7AvmgHhsETfKPcyInPGtBKvz9hb2lInh2pepLW5LXPgD/bKe4VagIA+cD
 Sg89ajwrZRK4nwSq2y3UzUkzNG/MpwE=
 =6Nmc
 -----END PGP SIGNATURE-----

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

Renesas driver updates for v5.7

  - Miscellaneous fixes and improvements.

* tag 'renesas-drivers-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Remove ARCH_R8A7795
  soc: renesas: rcar-sysc: Use the correct style for SPDX License Identifier

Link: https://lore.kernel.org/r/20200226110221.19288-6-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-03-25 13:17:25 +01:00
commit 1822d610c5
3 changed files with 13 additions and 13 deletions

View File

@ -193,19 +193,19 @@ config ARCH_R8A774C0
This enables support for the Renesas RZ/G2E SoC.
config ARCH_R8A77950
bool
config ARCH_R8A77951
bool
config ARCH_R8A7795
bool "Renesas R-Car H3 SoC Platform"
select ARCH_R8A77950
select ARCH_R8A77951
bool "Renesas R-Car H3 ES1.x SoC Platform"
select ARCH_RCAR_GEN3
select SYSC_R8A7795
help
This enables support for the Renesas R-Car H3 SoC.
This enables support for the Renesas R-Car H3 SoC (revision 1.x).
config ARCH_R8A77951
bool "Renesas R-Car H3 ES2.0+ SoC Platform"
select ARCH_RCAR_GEN3
select SYSC_R8A7795
help
This enables support for the Renesas R-Car H3 SoC (revisions 2.0 and
later).
config ARCH_R8A77960
bool "Renesas R-Car M3-W SoC Platform"

View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0
*
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Renesas R-Car System Controller
*
* Copyright (C) 2016 Glider bvba

View File

@ -259,7 +259,7 @@ static const struct of_device_id renesas_socs[] __initconst = {
#ifdef CONFIG_ARCH_R8A7794
{ .compatible = "renesas,r8a7794", .data = &soc_rcar_e2 },
#endif
#ifdef CONFIG_ARCH_R8A7795
#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)
{ .compatible = "renesas,r8a7795", .data = &soc_rcar_h3 },
#endif
#ifdef CONFIG_ARCH_R8A77960