soc: renesas: Remove ARCH_R8A7795

Replace the final user of CONFIG_ARCH_R8A7795 by CONFIG_ARCH_R8A77950 ||
CONFIG_ARCH_R8A77951, and remove the now unused CONFIG_ARCH_R8A7795
symbol definition.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200218112449.5723-1-geert+renesas@glider.be

diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index ba2b8b5..7f15451 100644 (file)
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -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"

diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 850f573..35dba8b 100644 (file)
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -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