summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-07-18 00:31:27 +0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-23 04:52:44 +0400
commitfd071b669ee2405e986636e389a3d1b6776e50a0 (patch)
tree408c3516d4c42eac682890ac439a5716453c547f
parentcbc60e7c04f3c1390144d4a881f0a7b98b49da98 (diff)
downloadlinux-fd071b669ee2405e986636e389a3d1b6776e50a0.tar.xz
ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration
Move the timer configuration bits to allow use in case of ARCH_SHMOBILE or ARCH_SHMOBILE_MULTI. The timers all make use of the regular driver model so they are safe to enable for ARCH_MULTIPLATFORM. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/Kconfig16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 8914c9b76048..cdefd7dcca79 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -32,6 +32,8 @@ config MACH_KZM9D_REFERENCE
of not supporting a number of devices.
This is intended to aid developers
+
+comment "SH-Mobile System Configuration"
endif
if ARCH_SHMOBILE
@@ -234,6 +236,15 @@ config CPU_HAS_INTEVT
bool
default y
+config SH_CLK_CPG
+ bool
+
+source "drivers/sh/Kconfig"
+
+endif
+
+if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+
menu "Timer and clock configuration"
config SHMOBILE_TIMER_HZ
@@ -268,9 +279,4 @@ config EM_TIMER_STI
endmenu
-config SH_CLK_CPG
- bool
-
-source "drivers/sh/Kconfig"
-
endif