ARM: mach-shmobile: Tidy up the Kconfig bits.

Presently each one of the CPUs manually selects the same feature set, and
there's a reasonable expectation that none of these will change for
future CPUs in the SH-Mobile / R-Mobile family, so we move those over to
the top-level ARCH_SHMOBILE.

While we're at it, all of the CPUs support optional GPIOs via the PFC,
do not have I/O ports, and expect sparse IRQ, so we bring the
configuration in line across the board.

This more or less brings the ARM-based parts in sync with their SH
counterparts.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db524e7..81c71da 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -606,9 +606,14 @@ config ARCH_MSM
          (clock and power control, etc).
 
 config ARCH_SHMOBILE
-       bool "Renesas SH-Mobile"
+       bool "Renesas SH-Mobile / R-Mobile"
+       select HAVE_CLK
+       select COMMON_CLKDEV
+       select GENERIC_CLOCKEVENTS
+       select NO_IOPORT
+       select SPARSE_IRQ
        help
-         Support for Renesas's SH-Mobile ARM platforms
+         Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
 
 config ARCH_RPC
        bool "RiscPC"

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 51dcd59..cc54343 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -5,26 +5,20 @@ comment "SH-Mobile System Type"
 config ARCH_SH7367
        bool "SH-Mobile G3 (SH7367)"
        select CPU_V6
-       select HAVE_CLK
-       select COMMON_CLKDEV
        select SH_CLK_CPG
-       select GENERIC_CLOCKEVENTS
+       select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7377
        bool "SH-Mobile G4 (SH7377)"
        select CPU_V7
-       select HAVE_CLK
-       select COMMON_CLKDEV
        select SH_CLK_CPG
-       select GENERIC_CLOCKEVENTS
+       select ARCH_WANT_OPTIONAL_GPIOLIB
 
 config ARCH_SH7372
        bool "SH-Mobile AP4 (SH7372)"
        select CPU_V7
-       select HAVE_CLK
-       select COMMON_CLKDEV
        select SH_CLK_CPG
-       select GENERIC_CLOCKEVENTS
+       select ARCH_WANT_OPTIONAL_GPIOLIB
 
 comment "SH-Mobile Board Type"