Commit 1822d610 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 98d54f81 4ff27112

drivers/soc/renesas/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -193,19 +193,19 @@ config ARCH_R8A774C0 
	  This enables support for the Renesas RZ/G2E SoC.



config ARCH_R8A77950

	bool

	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 (revision 1.x).



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 ES2.0+ 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 (revisions 2.0 and

	  later).



config ARCH_R8A77960

	bool "Renesas R-Car M3-W SoC Platform"

drivers/soc/renesas/rcar-sysc.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 *

/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Renesas R-Car System Controller

 *

 * Copyright (C) 2016 Glider bvba

drivers/soc/renesas/renesas-soc.c

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE