1 files changed, 39 insertions, 40 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e15dff790dbb..efc49dabbf2f 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,6 +1,30 @@
 config ARCH_SHMOBILE
         bool
 
+config PM_RCAR
+        bool
+
+config PM_RMOBILE
+        bool
+
+config ARCH_RCAR_GEN1
+        bool
+        select PM_RCAR if PM || SMP
+        select RENESAS_INTC_IRQPIN
+        select SYS_SUPPORTS_SH_TMU
+
+config ARCH_RCAR_GEN2
+        bool
+        select PM_RCAR if PM || SMP
+        select RENESAS_IRQC
+        select SYS_SUPPORTS_SH_CMT
+
+config ARCH_RMOBILE
+        bool
+        select PM_RMOBILE if PM && !ARCH_SHMOBILE_MULTI
+        select SYS_SUPPORTS_SH_CMT
+        select SYS_SUPPORTS_SH_TMU
+
 menuconfig ARCH_SHMOBILE_MULTI
         bool "Renesas ARM SoCs" if ARCH_MULTI_V7
         depends on MMU
@@ -28,18 +52,15 @@ config ARCH_R7S72100
 
 config ARCH_R8A7779
         bool "R-Car H1 (R8A77790)"
-        select RENESAS_INTC_IRQPIN
-        select SYS_SUPPORTS_SH_TMU
+        select ARCH_RCAR_GEN1
 
 config ARCH_R8A7790
         bool "R-Car H2 (R8A77900)"
-        select RENESAS_IRQC
-        select SYS_SUPPORTS_SH_CMT
+        select ARCH_RCAR_GEN2
 
 config ARCH_R8A7791
-        bool "R-Car M2 (R8A77910)"
-        select RENESAS_IRQC
-        select SYS_SUPPORTS_SH_CMT
+        bool "R-Car M2-W (R8A77910)"
+        select ARCH_RCAR_GEN2
 
 comment "Renesas ARM SoCs Board Type"
 
@@ -71,82 +92,60 @@ comment "Renesas ARM SoCs System Type"
 
 config ARCH_SH7372
         bool "SH-Mobile AP4 (SH7372)"
+        select ARCH_RMOBILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_CPU_SUSPEND if PM || CPU_IDLE
-        select CPU_V7
-        select SH_CLK_CPG
-        select SYS_SUPPORTS_SH_CMT
-        select SYS_SUPPORTS_SH_TMU
+        select SH_INTC
 
 config ARCH_SH73A0
         bool "SH-Mobile AG5 (R8A73A00)"
+        select ARCH_RMOBILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
         select I2C
-        select SH_CLK_CPG
+        select SH_INTC
         select RENESAS_INTC_IRQPIN
-        select SYS_SUPPORTS_SH_CMT
-        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_R8A73A4
         bool "R-Mobile APE6 (R8A73A40)"
+        select ARCH_RMOBILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
-        select SH_CLK_CPG
         select RENESAS_IRQC
-        select SYS_SUPPORTS_SH_CMT
-        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_R8A7740
         bool "R-Mobile A1 (R8A77400)"
+        select ARCH_RMOBILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
-        select SH_CLK_CPG
         select RENESAS_INTC_IRQPIN
-        select SYS_SUPPORTS_SH_CMT
-        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_R8A7778
         bool "R-Car M1A (R8A77781)"
+        select ARCH_RCAR_GEN1
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select CPU_V7
-        select SH_CLK_CPG
         select ARM_GIC
-        select SYS_SUPPORTS_SH_TMU
-        select RENESAS_INTC_IRQPIN
 
 config ARCH_R8A7779
         bool "R-Car H1 (R8A77790)"
+        select ARCH_RCAR_GEN1
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
-        select SH_CLK_CPG
-        select RENESAS_INTC_IRQPIN
-        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_R8A7790
         bool "R-Car H2 (R8A77900)"
+        select ARCH_RCAR_GEN2
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
         select MIGHT_HAVE_PCI
-        select SH_CLK_CPG
-        select RENESAS_IRQC
-        select SYS_SUPPORTS_SH_CMT
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 config ARCH_R8A7791
-        bool "R-Car M2 (R8A77910)"
+        bool "R-Car M2-W (R8A77910)"
+        select ARCH_RCAR_GEN2
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
-        select CPU_V7
         select MIGHT_HAVE_PCI
-        select SH_CLK_CPG
-        select RENESAS_IRQC
-        select SYS_SUPPORTS_SH_CMT
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 config ARCH_R7S72100