Skip to content

Commit

Permalink
ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Magnus Damm authored and Simon Horman committed Sep 2, 2014
1 parent 0ed82bc commit 0cdc23d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/mach-shmobile/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -113,38 +111,33 @@ config ARCH_R8A73A4
select ARCH_RMOBILE
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select SH_CLK_CPG
select RENESAS_IRQC

config ARCH_R8A7740
bool "R-Mobile A1 (R8A77400)"
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
bool "R-Car H1 (R8A77790)"
select ARCH_RCAR_GEN1
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select SH_CLK_CPG

config ARCH_R8A7790
bool "R-Car H2 (R8A77900)"
select ARCH_RCAR_GEN2
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
Expand All @@ -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
Expand Down

0 comments on commit 0cdc23d

Please sign in to comment.