From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/9] ARM: shmobile: Consolidate Legacy SH_CLK_CPG Kconfig
Date: Thu, 4 Sep 2014 10:12:39 +0900 [thread overview]
Message-ID: <0cdc23df6e4014a6dafe351da436dcc453f203b1.1409792454.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1409792454.git.horms+renesas@verge.net.au>
From: Magnus Damm <damm+renesas@opensource.se>
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>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-shmobile/Kconfig | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 93efc9a..bd8beae 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index d4cf8bf..6283ff2 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -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
--
2.0.1
next prev parent reply other threads:[~2014-09-04 1:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 1:12 [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Simon Horman
2014-09-04 1:12 ` [PATCH 1/9] ARM: shmobile: Introduce a Kconfig entry for R-Mobile Simon Horman
2014-09-04 1:12 ` [PATCH 2/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen1 Simon Horman
2014-09-04 1:12 ` [PATCH 3/9] ARM: shmobile: Introduce a Kconfig entry for R-Car Gen2 Simon Horman
2014-09-04 1:12 ` [PATCH 4/9] ARM: shmobile: Cleanup pm-rcar.o build using Kconfig Simon Horman
2014-09-04 1:12 ` [PATCH 5/9] ARM: shmobile: Cleanup pm-rmobile.o " Simon Horman
2014-09-04 1:12 ` [PATCH 6/9] ARM: shmobile: Only select PM_RMOBILE for legacy case Simon Horman
2014-09-04 1:12 ` [PATCH 7/9] ARM: shmobile: Consolidate Legacy CPU_V7 Kconfig Simon Horman
2014-09-04 1:12 ` Simon Horman [this message]
2014-09-04 1:12 ` [PATCH 9/9] ARM: shmobile: r8a7791 is now called "R-Car M2-W" Simon Horman
2014-09-05 16:15 ` [GIT PULL] Renesas ARM Based SoC Kconfig Cleanups for v3.18 Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0cdc23df6e4014a6dafe351da436dcc453f203b1.1409792454.git.horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).