Skip to content

Commit

Permalink
ARM: mach-shmobile: Tidy up the Kconfig bits.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Nov 16, 2010
1 parent e53beac commit 6d72ad3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
9 changes: 7 additions & 2 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 3 additions & 9 deletions arch/arm/mach-shmobile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 6d72ad3

Please sign in to comment.