From 95df9a4167d0ac0ff6d9080e28c26905dd9ef05d Mon Sep 17 00:00:00 2001
From: Thomas Abraham <thomas.abraham@linaro.org>
Date: Sat, 9 Mar 2013 16:16:13 +0900
Subject: [PATCH] --- yaml --- r: 372409 b: refs/heads/master c:
 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b h: refs/heads/master i:   372407:
 d9810461173f6a0e1ce13ba9bd7c32069b9483ad v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/arm/Kconfig                                      | 2 +-
 trunk/arch/arm/mach-exynos/Kconfig                          | 6 ------
 trunk/arch/arm/mach-exynos/Makefile                         | 2 --
 trunk/drivers/clocksource/Kconfig                           | 5 +++++
 trunk/drivers/clocksource/Makefile                          | 1 +
 .../mach-exynos/mct.c => drivers/clocksource/exynos_mct.c}  | 0
 7 files changed, 8 insertions(+), 10 deletions(-)
 rename trunk/{arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c} (100%)

diff --git a/[refs] b/[refs]
index b969f1964e9b..3bc90b485891 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c933512bb6948763f8e7f340f026b4167c117920
+refs/heads/master: 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 5b714695b01b..94a062894a10 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1650,7 +1650,7 @@ config LOCAL_TIMERS
 	bool "Use local timer interrupts"
 	depends on SMP
 	default y
-	select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)
+	select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !CLKSRC_EXYNOS_MCT)
 	help
 	  Enable support for local timers on SMP platforms, rather then the
 	  legacy IPI broadcast method.  Local timers allows the system
diff --git a/trunk/arch/arm/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig
index 52f51e7b4a0c..b0802eb24d40 100644
--- a/trunk/arch/arm/mach-exynos/Kconfig
+++ b/trunk/arch/arm/mach-exynos/Kconfig
@@ -79,12 +79,6 @@ config SOC_EXYNOS5440
 	help
 	  Enable EXYNOS5440 SoC support
 
-config EXYNOS4_MCT
-	bool
-	default y
-	help
-	  Use MCT (Multi Core Timer) as kernel timers
-
 config EXYNOS_DEV_DMA
 	bool
 	help
diff --git a/trunk/arch/arm/mach-exynos/Makefile b/trunk/arch/arm/mach-exynos/Makefile
index 435757e57bb4..daf289b21486 100644
--- a/trunk/arch/arm/mach-exynos/Makefile
+++ b/trunk/arch/arm/mach-exynos/Makefile
@@ -26,8 +26,6 @@ obj-$(CONFIG_ARCH_EXYNOS)	+= pmu.o
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 
-obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o
-
 obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 
 # machine support
diff --git a/trunk/drivers/clocksource/Kconfig b/trunk/drivers/clocksource/Kconfig
index e507ab7df60b..e8c453285151 100644
--- a/trunk/drivers/clocksource/Kconfig
+++ b/trunk/drivers/clocksource/Kconfig
@@ -67,3 +67,8 @@ config CLKSRC_METAG_GENERIC
 	def_bool y if METAG
 	help
 	  This option enables support for the Meta per-thread timers.
+
+config CLKSRC_EXYNOS_MCT
+	def_bool y if ARCH_EXYNOS
+	help
+	  Support for Multi Core Timer controller on Exynos SoCs.
diff --git a/trunk/drivers/clocksource/Makefile b/trunk/drivers/clocksource/Makefile
index 4d8283aec5b5..1c1b15db7c4d 100644
--- a/trunk/drivers/clocksource/Makefile
+++ b/trunk/drivers/clocksource/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o
 obj-$(CONFIG_SUNXI_TIMER)	+= sunxi_timer.o
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
 obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
+obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
 
 obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o
 obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o
diff --git a/trunk/arch/arm/mach-exynos/mct.c b/trunk/drivers/clocksource/exynos_mct.c
similarity index 100%
rename from trunk/arch/arm/mach-exynos/mct.c
rename to trunk/drivers/clocksource/exynos_mct.c