From f9b054fd817ea1c7b18bf14432ebdb8c1c155308 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 6 Mar 2012 17:37:01 +0900
Subject: [PATCH] --- yaml --- r: 295799 b: refs/heads/master c:
 df27a2d8f1d5e366ef84e9916fa6aab80904b8db h: refs/heads/master i:   295797:
 740e66378e5eda4b99cb94ea5dae8c4b7094c5e0   295795:
 63754f5e34ffbc602480d889db18c3841ba24d36   295791:
 b1fba6e05ee8f646d8977d996b4436656bee4d14 v: v3

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

diff --git a/[refs] b/[refs]
index ef87cef3c4a2..8d5263d577ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23e5bc03e3b07185d61c212bf39aaf126cc958e3
+refs/heads/master: df27a2d8f1d5e366ef84e9916fa6aab80904b8db
diff --git a/trunk/arch/arm/mach-shmobile/board-marzen.c b/trunk/arch/arm/mach-shmobile/board-marzen.c
index 43a77d912b4c..cbd5e4cd06d2 100644
--- a/trunk/arch/arm/mach-shmobile/board-marzen.c
+++ b/trunk/arch/arm/mach-shmobile/board-marzen.c
@@ -33,7 +33,6 @@
 #include <mach/common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/time.h>
 #include <asm/hardware/gic.h>
 #include <asm/traps.h>
 
@@ -91,17 +90,6 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-static void __init marzen_timer_init(void)
-{
-	r8a7779_clock_init();
-	shmobile_timer.init();
-	return;
-}
-
-struct sys_timer marzen_timer = {
-	.init	= marzen_timer_init,
-};
-
 MACHINE_START(MARZEN, "marzen")
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,
@@ -109,5 +97,5 @@ MACHINE_START(MARZEN, "marzen")
 	.init_irq	= r8a7779_init_irq,
 	.handle_irq	= gic_handle_irq,
 	.init_machine	= marzen_init,
-	.timer		= &marzen_timer,
+	.timer		= &shmobile_timer,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
index 9bb133c2a932..ce57d90c4bbc 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -33,6 +33,7 @@
 #include <mach/common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/cache-l2x0.h>
 
@@ -260,6 +261,12 @@ void __init r8a7779_add_standard_devices(void)
 			    ARRAY_SIZE(r8a7779_late_devices));
 }
 
+static void __init r8a7779_earlytimer_init(void)
+{
+	r8a7779_clock_init();
+	shmobile_earlytimer_init();
+}
+
 void __init r8a7779_add_early_devices(void)
 {
 	early_platform_add_devices(r8a7779_early_devices,
@@ -280,4 +287,7 @@ void __init r8a7779_add_early_devices(void)
 	 * As a final step pass earlyprint=sh-sci.2,115200 on the kernel
 	 * command line in case of the marzen board.
 	 */
+
+	/* override timer setup with soc-specific code */
+	shmobile_timer.init = r8a7779_earlytimer_init;
 }