Revert "ARM: tegra: move timer.c to drivers/clocksource/"
Dan Willemsen [Mon, 29 Jul 2013 20:39:58 +0000 (13:39 -0700)]
This reverts commit 1711b1e10224dbebc885b7bf7ca2f03f51ff9f4a.

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

arch/arm/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/mach-tegra/board.h
arch/arm/mach-tegra/timer.c [moved from drivers/clocksource/tegra20_timer.c with 98% similarity]
drivers/clocksource/Makefile

index 5420f7c..25de664 100644 (file)
@@ -605,7 +605,6 @@ config ARCH_TEGRA
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-       select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
index 9bbe740..4aff5b9 100644 (file)
@@ -3,6 +3,7 @@ asflags-y                               += -march=armv7-a
 obj-y                                   += common.o
 obj-y                                   += io.o
 obj-y                                   += irq.o
+obj-y                                   += timer.o
 obj-y                                  += fuse.o
 obj-y                                  += pmc.o
 obj-y                                  += flowctrl.o
index 7f0b6f8..3250e59 100644 (file)
@@ -15,7 +15,6 @@
  *
  */
 
-#include <linux/clocksource.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -174,7 +173,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
        .smp            = smp_ops(tegra_smp_ops),
        .init_early     = tegra20_init_early,
        .init_irq       = tegra_dt_init_irq,
-       .init_time      = clocksource_of_init,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_dt_init,
        .init_late      = tegra_dt_init_late,
        .restart        = tegra_assert_system_reset,
index 36d1a99..a0005c2 100644 (file)
@@ -23,7 +23,6 @@
  *
  */
 
-#include <linux/clocksource.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
@@ -81,7 +80,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
        .map_io         = tegra_map_common_io,
        .init_early     = tegra30_init_early,
        .init_irq       = tegra_dt_init_irq,
-       .init_time      = clocksource_of_init,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra30_dt_init,
        .init_late      = tegra_init_late,
        .restart        = tegra_assert_system_reset,
index da8f5a3..744cdd2 100644 (file)
@@ -55,4 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; }
 
 void __init tegra_paz00_wifikill_init(void);
 
+extern void tegra_init_timer(void);
 #endif
similarity index 98%
rename from drivers/clocksource/tegra20_timer.c
rename to arch/arm/mach-tegra/timer.c
index 0bde03f..905c15b 100644 (file)
@@ -1,4 +1,6 @@
 /*
+ * arch/arch/mach-tegra/timer.c
+ *
  * Copyright (C) 2010 Google, Inc.
  *
  * Author:
@@ -31,6 +33,8 @@
 #include <asm/smp_twd.h>
 #include <asm/sched_clock.h>
 
+#include "board.h"
+
 #define RTC_SECONDS            0x08
 #define RTC_SHADOW_SECONDS     0x0c
 #define RTC_MILLISECONDS       0x10
@@ -164,7 +168,7 @@ static const struct of_device_id rtc_match[] __initconst = {
        {}
 };
 
-static void __init tegra20_init_timer(void)
+void __init tegra_init_timer(void)
 {
        struct device_node *np;
        struct clk *clk;
@@ -264,7 +268,6 @@ static void __init tegra20_init_timer(void)
 #endif
        register_persistent_clock(NULL, tegra_read_persistent_clock);
 }
-CLOCKSOURCE_OF_DECLARE(tegra20, "nvidia,tegra20-timer", tegra20_init_timer);
 
 #ifdef CONFIG_PM
 static u32 usec_config;
index 8d979c7..399fc48 100644 (file)
@@ -20,7 +20,6 @@ obj-$(CONFIG_ARCH_MARCO)      += timer-marco.o
 obj-$(CONFIG_ARCH_MXS)         += mxs_timer.o
 obj-$(CONFIG_ARCH_PRIMA2)      += timer-prima2.o
 obj-$(CONFIG_SUN4I_TIMER)      += sun4i_timer.o
-obj-$(CONFIG_ARCH_TEGRA)       += tegra20_timer.o
 obj-$(CONFIG_VT8500_TIMER)     += vt8500_timer.o
 obj-$(CONFIG_ARCH_BCM)         += bcm_kona_timer.o
 obj-$(CONFIG_CADENCE_TTC_TIMER)        += cadence_ttc_timer.o