ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig

Consolidate SH_CLK_CPG under ARCH_SHMOBILE_LEGACY so it can
be shared by the legacy ARM mach-shmobile support code.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 0cdc23df6e4014a6dafe351da436dcc453f203b1)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
	arch/arm/mach-shmobile/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1c3ea51..9542b56 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -688,6 +688,7 @@ config ARCH_SHMOBILE_LEGACY
        select NO_IOPORT_MAP
        select PINCTRL
        select PM_GENERIC_DOMAINS if PM
+       select SH_CLK_CPG
        select SPARSE_IRQ
        help
          Support for Renesas ARM SoC platforms using a non-multiplatform

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 5ba4f7e..87b155e 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -92,7 +92,6 @@ config ARCH_SH7372
        select ARCH_RMOBILE
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_CPU_SUSPEND if PM || CPU_IDLE
-       select SH_CLK_CPG
        select SH_INTC
 
 config ARCH_SH73A0
@@ -101,7 +100,6 @@ config ARCH_SH73A0
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select I2C
-       select SH_CLK_CPG
        select SH_INTC
        select RENESAS_INTC_IRQPIN
 
@@ -110,7 +108,6 @@ config ARCH_R8A73A4
        select ARCH_RMOBILE
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
-       select SH_CLK_CPG
        select RENESAS_IRQC
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
@@ -120,14 +117,12 @@ config ARCH_R8A7740
        select ARCH_RMOBILE
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
-       select SH_CLK_CPG
        select RENESAS_INTC_IRQPIN
 
 config ARCH_R8A7778
        bool "R-Car M1A (R8A77781)"
        select ARCH_RCAR_GEN1
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select SH_CLK_CPG
        select ARM_GIC
 
 config ARCH_R8A7779
@@ -135,7 +130,6 @@ config ARCH_R8A7779
        select ARCH_RCAR_GEN1
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
-       select SH_CLK_CPG
 
 config ARCH_R8A7790
        bool "R-Car H2 (R8A77900)"
@@ -143,7 +137,6 @@ config ARCH_R8A7790
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select MIGHT_HAVE_PCI
-       select SH_CLK_CPG
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 config ARCH_R8A7791
@@ -152,7 +145,6 @@ config ARCH_R8A7791
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select MIGHT_HAVE_PCI
-       select SH_CLK_CPG
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
 comment "Renesas ARM SoCs Board Type"