Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cdc23df authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

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: default avatarMagnus Damm <damm+renesas@opensource.se>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 0ed82bc9

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,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

arch/arm/mach-shmobile/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -95,7 +95,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
@@ -104,7 +103,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
@@ -113,7 +111,6 @@ config ARCH_R8A73A4 
	select ARCH_RMOBILE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_GIC

	select SH_CLK_CPG

	select RENESAS_IRQC



config ARCH_R8A7740
@@ -121,14 +118,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
@@ -136,7 +131,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)"
@@ -144,7 +138,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
@@ -153,7 +146,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



config ARCH_R7S72100