ARM: tegra: move tsc timers to drivers/clocksource
Ajay Nandakumar [Thu, 26 Sep 2013 13:48:41 +0000 (18:48 +0530)]
Moving tegra tsc timer to drivers/clocksource

Bug 1379817

Change-Id: Ifa1b1b1638960c390f3fca4ba2261a5692cc8f61
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/299021
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

arch/arm/mach-tegra/Makefile
drivers/clocksource/Makefile
drivers/clocksource/tegra-tsc-timer.c [moved from arch/arm/mach-tegra/cpu_timer_arch.c with 98% similarity]

index 0bf4af4..3350369 100644 (file)
@@ -15,7 +15,6 @@ ifneq ($(CONFIG_CLK_SRC_TEGRA_TIMER),y)
 obj-y                                   += timer.o
 endif
 obj-$(CONFIG_HAVE_ARM_TWD)              += cpu_timer_twd.o
-obj-$(CONFIG_ARM_ARCH_TIMER)            += cpu_timer_arch.o
 obj-y                                   += timerinfo.o
 ifneq ($(CONFIG_ARCH_TEGRA_2x_SOC),y)
 ifneq ($(CONFIG_ARCH_TEGRA_3x_SOC),y)
index ef212f8..ee53061 100644 (file)
@@ -31,3 +31,4 @@ obj-$(CONFIG_CLKSRC_METAG_GENERIC)    += metag_generic.o
 
 obj-$(CONFIG_CLK_SRC_TEGRA_TIMER)       += tegra-nvtimers.o
 obj-$(CONFIG_CLK_SRC_TEGRA_TIMER)       += tegra-wakeup-nvtimers.o
+obj-$(CONFIG_ARM_ARCH_TIMER)            += tegra-tsc-timer.o
similarity index 98%
rename from arch/arm/mach-tegra/cpu_timer_arch.c
rename to drivers/clocksource/tegra-tsc-timer.c
index b8374a9..77a2d3f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * arch/arch/mach-tegra/cpu_timer_arch.c
+ * drivers/clocksource/tegra-tsc-timer.c
  *
  * Copyright (C) 2010 Google, Inc.
  *
@@ -36,9 +36,8 @@
 #include <asm/sched_clock.h>
 #include <asm/delay.h>
 
-#include "clock.h"
-#include "iomap.h"
-#include "fuse.h"
+#include "../../arch/arm/mach-tegra/clock.h"
+
 
 static u32 arch_timer_us_mult, arch_timer_us_shift;
 
@@ -194,8 +193,6 @@ static struct notifier_block arch_timer_cpu_pm_nb = {
 
 int __init tegra_init_arch_timer(void)
 {
-       int err;
-
        if (!local_timer_is_architected())
                return -ENODEV;