Merge tag 'trace-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index aeb2eed085988bb853685cc0174b192de0b4f054..b100c26a858f9015b5b001c7a6c52acd227d94aa 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,6 +1,4 @@
-config ARCH_SHMOBILE
-       bool
-
+# SPDX-License-Identifier: GPL-2.0
 config PM_RMOBILE
        bool
        select PM
@@ -30,7 +28,6 @@ config ARCH_RMOBILE
 menuconfig ARCH_RENESAS
        bool "Renesas ARM SoCs"
        depends on ARCH_MULTI_V7 && MMU
-       select ARCH_SHMOBILE
        select ARM_GIC
        select GPIOLIB
        select HAVE_ARM_SCU if SMP
@@ -55,6 +52,12 @@ config ARCH_R7S72100
        select SYS_SUPPORTS_SH_MTU2
        select RENESAS_OSTM
 
+config ARCH_R7S9210
+       bool "RZ/A2 (R7S9210)"
+       select PM
+       select PM_GENERIC_DOMAINS
+       select RENESAS_OSTM
+
 config ARCH_R8A73A4
        bool "R-Mobile APE6 (R8A73A40)"
        select ARCH_RMOBILE
@@ -72,6 +75,11 @@ config ARCH_R8A7743
        select ARCH_RCAR_GEN2
        select ARM_ERRATA_798181 if SMP
 
+config ARCH_R8A7744
+       bool "RZ/G1N (R8A77440)"
+       select ARCH_RCAR_GEN2
+       select ARM_ERRATA_798181 if SMP
+
 config ARCH_R8A7745
        bool "RZ/G1E (R8A77450)"
        select ARCH_RCAR_GEN2