From 63754f5e34ffbc602480d889db18c3841ba24d36 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 6 Mar 2012 17:36:29 +0900
Subject: [PATCH] --- yaml --- r: 295795 b: refs/heads/master c:
 03f7beeff44a5ab03bb0afa1f0522cf26a117aeb h: refs/heads/master i:   295793:
 ce8927cc1acf06678baa51a9eb54970ba1471f35   295791:
 b1fba6e05ee8f646d8977d996b4436656bee4d14 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-shmobile/board-g4evm.c  | 13 +------------
 trunk/arch/arm/mach-shmobile/setup-sh7377.c | 10 ++++++++++
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 57f705292dcf..bcf47a3dcc78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e8de440da4a6c231e3970566712149d4593831a
+refs/heads/master: 03f7beeff44a5ab03bb0afa1f0522cf26a117aeb
diff --git a/trunk/arch/arm/mach-shmobile/board-g4evm.c b/trunk/arch/arm/mach-shmobile/board-g4evm.c
index 4ba2a79fb180..46d757d2759d 100644
--- a/trunk/arch/arm/mach-shmobile/board-g4evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-g4evm.c
@@ -38,7 +38,6 @@
 #include <mach/common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/time.h>
 
 /*
  * SDHI
@@ -375,21 +374,11 @@ static void __init g4evm_init(void)
 	platform_add_devices(g4evm_devices, ARRAY_SIZE(g4evm_devices));
 }
 
-static void __init g4evm_timer_init(void)
-{
-	sh7377_clock_init();
-	shmobile_timer.init();
-}
-
-static struct sys_timer g4evm_timer = {
-	.init		= g4evm_timer_init,
-};
-
 MACHINE_START(G4EVM, "g4evm")
 	.map_io		= sh7377_map_io,
 	.init_early	= sh7377_add_early_devices,
 	.init_irq	= sh7377_init_irq,
 	.handle_irq	= shmobile_handle_irq_intc,
 	.init_machine	= g4evm_init,
-	.timer		= &g4evm_timer,
+	.timer		= &shmobile_timer,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-shmobile/setup-sh7377.c b/trunk/arch/arm/mach-shmobile/setup-sh7377.c
index 979cf815c298..9f146095098b 100644
--- a/trunk/arch/arm/mach-shmobile/setup-sh7377.c
+++ b/trunk/arch/arm/mach-shmobile/setup-sh7377.c
@@ -34,6 +34,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/time.h>
 
 static struct map_desc sh7377_io_desc[] __initdata = {
 	/* create a 1:1 entity map for 0xe6xxxxxx
@@ -475,6 +476,12 @@ void __init sh7377_add_standard_devices(void)
 			    ARRAY_SIZE(sh7377_devices));
 }
 
+static void __init sh7377_earlytimer_init(void)
+{
+	sh7377_clock_init();
+	shmobile_earlytimer_init();
+}
+
 #define SMSTPCR3 0xe615013c
 #define SMSTPCR3_CMT1 (1 << 29)
 
@@ -488,4 +495,7 @@ void __init sh7377_add_early_devices(void)
 
 	/* setup early console here as well */
 	shmobile_setup_console();
+
+	/* override timer setup with soc-specific code */
+	shmobile_timer.init = sh7377_earlytimer_init;
 }