aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-07-17 16:31:27 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-22 20:52:44 -0400
commitfd071b669ee2405e986636e389a3d1b6776e50a0 (patch)
tree408c3516d4c42eac682890ac439a5716453c547f
parentcbc60e7c04f3c1390144d4a881f0a7b98b49da98 (diff)
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
32 of not supporting a number of devices. 32 of not supporting a number of devices.
33 33
34 This is intended to aid developers 34 This is intended to aid developers
35
36comment "SH-Mobile System Configuration"
35endif 37endif
36 38
37if ARCH_SHMOBILE 39if ARCH_SHMOBILE
@@ -234,6 +236,15 @@ config CPU_HAS_INTEVT
234 bool 236 bool
235 default y 237 default y
236 238
239config SH_CLK_CPG
240 bool
241
242source "drivers/sh/Kconfig"
243
244endif
245
246if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
247
237menu "Timer and clock configuration" 248menu "Timer and clock configuration"
238 249
239config SHMOBILE_TIMER_HZ 250config SHMOBILE_TIMER_HZ
@@ -268,9 +279,4 @@ config EM_TIMER_STI
268 279
269endmenu 280endmenu
270 281
271config SH_CLK_CPG
272 bool
273
274source "drivers/sh/Kconfig"
275
276endif 282endif