From 4f835faf1b3b1669079a1ad83aa3b4f62086f862 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Sat, 4 Feb 2006 11:05:33 +0100
Subject: [PATCH] --- yaml --- r: 20071 b: refs/heads/master c:
 03478804920a53405dfff73a0b23e9dcbbbee1c1 h: refs/heads/master i:   20069:
 8fd2829dae177b0b4f336081ce2499e7252a05db   20067:
 15e5fb0e46df63b0f5b87de663b41689bc6263ec   20063:
 7a88737e3476648af068501a082c104715c5fc78 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/platforms/chrp/chrp.h  |  1 -
 trunk/arch/powerpc/platforms/chrp/setup.c |  2 +-
 trunk/arch/powerpc/platforms/chrp/time.c  | 21 ---------------------
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 8c3d3cc7e420..33518f48e2fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8a8188ded1251afc6a2ec8a668b0bdf038b64a1
+refs/heads/master: 03478804920a53405dfff73a0b23e9dcbbbee1c1
diff --git a/trunk/arch/powerpc/platforms/chrp/chrp.h b/trunk/arch/powerpc/platforms/chrp/chrp.h
index 3a2057fa314a..814f54742e0f 100644
--- a/trunk/arch/powerpc/platforms/chrp/chrp.h
+++ b/trunk/arch/powerpc/platforms/chrp/chrp.h
@@ -5,7 +5,6 @@
 extern void chrp_nvram_init(void);
 extern void chrp_get_rtc_time(struct rtc_time *);
 extern int chrp_set_rtc_time(struct rtc_time *);
-extern void chrp_calibrate_decr(void);
 extern long chrp_time_init(void);
 
 extern void chrp_find_bridges(void);
diff --git a/trunk/arch/powerpc/platforms/chrp/setup.c b/trunk/arch/powerpc/platforms/chrp/setup.c
index 2dc87aa5962f..e1fadbf49150 100644
--- a/trunk/arch/powerpc/platforms/chrp/setup.c
+++ b/trunk/arch/powerpc/platforms/chrp/setup.c
@@ -506,7 +506,7 @@ void __init chrp_init(void)
 	ppc_md.halt           = rtas_halt;
 
 	ppc_md.time_init      = chrp_time_init;
-	ppc_md.calibrate_decr = chrp_calibrate_decr;
+	ppc_md.calibrate_decr = generic_calibrate_decr;
 
 	/* this may get overridden with rtas routines later... */
 	ppc_md.set_rtc_time   = chrp_set_rtc_time;
diff --git a/trunk/arch/powerpc/platforms/chrp/time.c b/trunk/arch/powerpc/platforms/chrp/time.c
index 36a0f97bb7b1..78df2e7ca88a 100644
--- a/trunk/arch/powerpc/platforms/chrp/time.c
+++ b/trunk/arch/powerpc/platforms/chrp/time.c
@@ -167,24 +167,3 @@ void chrp_get_rtc_time(struct rtc_time *tm)
 	tm->tm_mon = mon;
 	tm->tm_year = year;
 }
-
-
-void __init chrp_calibrate_decr(void)
-{
-	struct device_node *cpu;
-	unsigned int freq, *fp;
-
-	/*
-	 * The cpu node should have a timebase-frequency property
-	 * to tell us the rate at which the decrementer counts.
-	 */
-	freq = 16666000;		/* hardcoded default */
-	cpu = find_type_devices("cpu");
-	if (cpu != 0) {
-		fp = (unsigned int *)
-			get_property(cpu, "timebase-frequency", NULL);
-		if (fp != 0)
-			freq = *fp;
-	}
-	ppc_tb_freq = freq;
-}