From ca0bd17d28798daec22474bbd38399ce24a4a486 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Wed, 6 Feb 2013 21:18:31 -0600
Subject: [PATCH] --- yaml --- r: 374193 b: refs/heads/master c:
 dabfd8fb84abfddf526123388b68a50ec14cd380 h: refs/heads/master i:   374191:
 fcce5befc29dbdde3cf7b760f78b4b9bd8a3f29f v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-vexpress/v2m.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 120011e34932..7e1935a2354d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5993b3ee98c6b1a86fc0f0a4bed12a1dd9f0eae5
+refs/heads/master: dabfd8fb84abfddf526123388b68a50ec14cd380
diff --git a/trunk/arch/arm/mach-vexpress/v2m.c b/trunk/arch/arm/mach-vexpress/v2m.c
index 621571781b20..cdc29d895ab0 100644
--- a/trunk/arch/arm/mach-vexpress/v2m.c
+++ b/trunk/arch/arm/mach-vexpress/v2m.c
@@ -431,20 +431,9 @@ void __init v2m_dt_init_early(void)
 
 static void __init v2m_dt_timer_init(void)
 {
-	struct device_node *node = NULL;
-
 	vexpress_clk_of_init();
 
 	clocksource_of_init();
-	do {
-		node = of_find_compatible_node(node, NULL, "arm,sp804");
-	} while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB);
-	if (node) {
-		pr_info("Using SP804 '%s' as a clock & events source\n",
-				node->full_name);
-		v2m_sp804_init(of_iomap(node, 0),
-				irq_of_parse_and_map(node, 0));
-	}
 
 	versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
 				24000000);