4 files changed, 4 insertions, 8 deletions

diff --git a/arch/arm/mach-spear13xx/include/mach/generic.h b/arch/arm/mach-spear13xx/include/mach/generic.h
index 510dec798221..633e678e01a3 100644
--- a/arch/arm/mach-spear13xx/include/mach/generic.h
+++ b/arch/arm/mach-spear13xx/include/mach/generic.h
@@ -18,7 +18,7 @@
 #include <asm/mach/time.h>
 
 /* Add spear13xx structure declarations here */
-extern struct sys_timer spear13xx_timer;
+extern void spear13xx_timer_init(void);
 extern struct pl022_ssp_controller pl022_plat_data;
 extern struct dw_dma_platform_data dmac_plat_data;
 extern struct dw_dma_slave cf_dma_priv;
diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c
index 5de3e6f24aad..56214d1076ef 100644
--- a/arch/arm/mach-spear13xx/spear1310.c
+++ b/arch/arm/mach-spear13xx/spear1310.c
@@ -91,7 +91,7 @@ DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")
         .smp            =       smp_ops(spear13xx_smp_ops),
         .map_io         =       spear1310_map_io,
         .init_irq       =       irqchip_init,
-        .timer          =       &spear13xx_timer,
+        .init_time      =       spear13xx_timer_init,
         .init_machine   =       spear1310_dt_init,
         .restart        =       spear_restart,
         .dt_compat      =       spear1310_dt_board_compat,
diff --git a/arch/arm/mach-spear13xx/spear1340.c b/arch/arm/mach-spear13xx/spear1340.c
index 18331deaed76..9a28beb2a113 100644
--- a/arch/arm/mach-spear13xx/spear1340.c
+++ b/arch/arm/mach-spear13xx/spear1340.c
@@ -185,7 +185,7 @@ DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")
         .smp            =       smp_ops(spear13xx_smp_ops),
         .map_io         =       spear13xx_map_io,
         .init_irq       =       irqchip_init,
-        .timer          =       &spear13xx_timer,
+        .init_time      =       spear13xx_timer_init,
         .init_machine   =       spear1340_dt_init,
         .restart        =       spear_restart,
         .dt_compat      =       spear1340_dt_board_compat,
diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c
index 22e3cd57e750..c7d2b4a8d8cc 100644
--- a/arch/arm/mach-spear13xx/spear13xx.c
+++ b/arch/arm/mach-spear13xx/spear13xx.c
@@ -152,7 +152,7 @@ static void __init spear13xx_clk_init(void)
                 pr_err("%s: Unknown machine\n", __func__);
 }
 
-static void __init spear13xx_timer_init(void)
+void __init spear13xx_timer_init(void)
 {
         char pclk_name[] = "osc_24m_clk";
         struct clk *gpt_clk, *pclk;
@@ -181,7 +181,3 @@ static void __init spear13xx_timer_init(void)
         spear_setup_of_timer();
         twd_local_timer_of_register();
 }
-
-struct sys_timer spear13xx_timer = {
-        .init = spear13xx_timer_init,
-};