Commit 39e57e14 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W 



Add CONFIG_ARCH_R8A77960 as a new config symbol for R-Car M3-W
(R8A77960), to replace CONFIG_ARCH_R8A7796, and avoid confusion with
R-Car M3-W+ (R8A77961), which will use CONFIG_ARCH_R8A77961.

Note that for now, CONFIG_ARCH_R8A7796 is retained, and just selects
CONFIG_ARCH_R8A77960.  This relaxes dependencies of other subsystems on
the SoC configuration symbol, and provides a smooth transition path for
config files through "make oldconfig".

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191023123342.13100-3-geert+renesas@glider.be
parent f79edb17

drivers/soc/renesas/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -199,10 +199,14 @@ config ARCH_R8A7795 
	help

	  This enables support for the Renesas R-Car H3 SoC.



config ARCH_R8A7796

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

config ARCH_R8A77960

	bool

	select ARCH_RCAR_GEN3

	select SYSC_R8A77960



config ARCH_R8A7796

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

	select ARCH_R8A77960

	help

	  This enables support for the Renesas R-Car M3-W SoC.

drivers/soc/renesas/renesas-soc.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#ifdef CONFIG_ARCH_R8A7795

	{ .compatible = "renesas,r8a7795",	.data = &soc_rcar_h3 },

#endif

#ifdef CONFIG_ARCH_R8A7796

#ifdef CONFIG_ARCH_R8A77960

	{ .compatible = "renesas,r8a7796",	.data = &soc_rcar_m3_w },

#endif

#ifdef CONFIG_ARCH_R8A77965

CRA Git | Maintained and supported by SUSTech CRA and CCSE