| From 85724d89ea3373bff63887efcfb17f94b95a1e28 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 18 Jul 2013 05:31:27 +0900 |
| Subject: 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> |
| (cherry picked from commit fd071b669ee2405e986636e389a3d1b6776e50a0) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 16 +++++++++++----- |
| 1 file changed, 11 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index e7c399c1..af946061 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 |
| @@ -257,6 +259,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 |
| @@ -291,9 +302,4 @@ config EM_TIMER_STI |
| |
| endmenu |
| |
| -config SH_CLK_CPG |
| - bool |
| - |
| -source "drivers/sh/Kconfig" |
| - |
| endif |
| -- |
| 1.8.4.3.gca3854a |
| |
