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

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
...@@ -199,10 +199,14 @@ config ARCH_R8A7795 ...@@ -199,10 +199,14 @@ config ARCH_R8A7795
help help
This enables support for the Renesas R-Car H3 SoC. This enables support for the Renesas R-Car H3 SoC.
config ARCH_R8A7796 config ARCH_R8A77960
bool "Renesas R-Car M3-W SoC Platform" bool
select ARCH_RCAR_GEN3 select ARCH_RCAR_GEN3
select SYSC_R8A77960 select SYSC_R8A77960
config ARCH_R8A7796
bool "Renesas R-Car M3-W SoC Platform"
select ARCH_R8A77960
help help
This enables support for the Renesas R-Car M3-W SoC. This enables support for the Renesas R-Car M3-W SoC.
......
...@@ -262,7 +262,7 @@ static const struct of_device_id renesas_socs[] __initconst = { ...@@ -262,7 +262,7 @@ static const struct of_device_id renesas_socs[] __initconst = {
#ifdef CONFIG_ARCH_R8A7795 #ifdef CONFIG_ARCH_R8A7795
{ .compatible = "renesas,r8a7795", .data = &soc_rcar_h3 }, { .compatible = "renesas,r8a7795", .data = &soc_rcar_h3 },
#endif #endif
#ifdef CONFIG_ARCH_R8A7796 #ifdef CONFIG_ARCH_R8A77960
{ .compatible = "renesas,r8a7796", .data = &soc_rcar_m3_w }, { .compatible = "renesas,r8a7796", .data = &soc_rcar_m3_w },
#endif #endif
#ifdef CONFIG_ARCH_R8A77965 #ifdef CONFIG_ARCH_R8A77965
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment