Merge tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[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 b100c26a858f9015b5b001c7a6c52acd227d94aa..3683d6f109730ee796687d0b66c063cba8253108 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,139 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0
-config PM_RMOBILE
-       bool
-       select PM
-       select PM_GENERIC_DOMAINS
-
-config ARCH_RCAR_GEN1
-       bool
-       select PM
-       select PM_GENERIC_DOMAINS
-       select RENESAS_INTC_IRQPIN
-       select SYS_SUPPORTS_SH_TMU
-
-config ARCH_RCAR_GEN2
-       bool
-       select HAVE_ARM_ARCH_TIMER
-       select PM
-       select PM_GENERIC_DOMAINS
-       select RENESAS_IRQC
-       select SYS_SUPPORTS_SH_CMT
-
-config ARCH_RMOBILE
-       bool
-       select PM_RMOBILE
-       select SYS_SUPPORTS_SH_CMT
-       select SYS_SUPPORTS_SH_TMU
-
 menuconfig ARCH_RENESAS
        bool "Renesas ARM SoCs"
        depends on ARCH_MULTI_V7 && MMU
        select ARM_GIC
        select GPIOLIB
-       select HAVE_ARM_SCU if SMP
-       select HAVE_ARM_TWD if SMP
        select NO_IOPORT_MAP
        select PINCTRL
        select SOC_BUS
        select ZONE_DMA if ARM_LPAE
-
-if ARCH_RENESAS
-
-#comment "Renesas ARM SoCs System Type"
-
-config ARCH_EMEV2
-       bool "Emma Mobile EV2"
-       select SYS_SUPPORTS_EM_STI
-
-config ARCH_R7S72100
-       bool "RZ/A1H (R7S72100)"
-       select PM
-       select PM_GENERIC_DOMAINS
-       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
-       select ARM_ERRATA_798181 if SMP
-       select HAVE_ARM_ARCH_TIMER
-       select RENESAS_IRQC
-
-config ARCH_R8A7740
-       bool "R-Mobile A1 (R8A77400)"
-       select ARCH_RMOBILE
-       select RENESAS_INTC_IRQPIN
-
-config ARCH_R8A7743
-       bool "RZ/G1M (R8A77430)"
-       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
-
-config ARCH_R8A77470
-       bool "RZ/G1C (R8A77470)"
-       select ARCH_RCAR_GEN2
-
-config ARCH_R8A7778
-       bool "R-Car M1A (R8A77781)"
-       select ARCH_RCAR_GEN1
-
-config ARCH_R8A7779
-       bool "R-Car H1 (R8A77790)"
-       select ARCH_RCAR_GEN1
-
-config ARCH_R8A7790
-       bool "R-Car H2 (R8A77900)"
-       select ARCH_RCAR_GEN2
-       select ARM_ERRATA_798181 if SMP
-       select I2C
-
-config ARCH_R8A7791
-       bool "R-Car M2-W (R8A77910)"
-       select ARCH_RCAR_GEN2
-       select ARM_ERRATA_798181 if SMP
-       select I2C
-
-config ARCH_R8A7792
-       bool "R-Car V2H (R8A77920)"
-       select ARCH_RCAR_GEN2
-       select ARM_ERRATA_798181 if SMP
-
-config ARCH_R8A7793
-       bool "R-Car M2-N (R8A7793)"
-       select ARCH_RCAR_GEN2
-       select ARM_ERRATA_798181 if SMP
-       select I2C
-
-config ARCH_R8A7794
-       bool "R-Car E2 (R8A77940)"
-       select ARCH_RCAR_GEN2
-
-config ARCH_R9A06G032
-       bool "RZ/N1D (R9A06G032)"
-       select ARCH_RZN1
-
-config ARCH_RZN1
-       bool "RZ/N1 (R9A06G0xx) Family"
-       select ARM_AMBA
-       select CPU_V7
-
-config ARCH_SH73A0
-       bool "SH-Mobile AG5 (R8A73A00)"
-       select ARCH_RMOBILE
-       select RENESAS_INTC_IRQPIN
-endif