Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/kernel/linux-rpi.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index ebab13e..2bb4b09 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -32,16 +32,16 @@ config ARCH_RMOBILE
 menuconfig ARCH_RENESAS
        bool "Renesas ARM SoCs"
        depends on ARCH_MULTI_V7 && MMU
+       select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
        select ARCH_SHMOBILE
        select ARCH_SHMOBILE_MULTI
+       select ARM_GIC
+       select GPIOLIB
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
-       select ARM_GIC
-       select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
        select NO_IOPORT_MAP
        select PINCTRL
        select SOC_BUS
-       select GPIOLIB
        select ZONE_DMA if ARM_LPAE
 
 if ARCH_RENESAS
@@ -61,6 +61,7 @@ config ARCH_R7S72100
 config ARCH_R8A73A4
        bool "R-Mobile APE6 (R8A73A40)"
        select ARCH_RMOBILE
+       select ARM_ERRATA_798181 if SMP
        select RENESAS_IRQC
 
 config ARCH_R8A7740
@@ -68,6 +69,15 @@ config ARCH_R8A7740
        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_R8A7745
+       bool "RZ/G1E (R8A77450)"
+       select ARCH_RCAR_GEN2
+
 config ARCH_R8A7778
        bool "R-Car M1A (R8A77781)"
        select ARCH_RCAR_GEN1
@@ -79,20 +89,24 @@ config ARCH_R8A7779
 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