From: Tony Lindgren <tony@atomide.com>
Date: Wed, 9 Nov 2005 17:39:16 +0000 (-0800)
Subject: ARM: OMAP: Fix source clock for timer-gp.c
X-Git-Tag: v2.6.15-omap2~102^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8bc8bf077771a7dc3f8c0953ef62277cfc4ba94d;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix source clock for timer-gp.c

The source clock should be sys_ck, not osc_ck as pointed out by
Richard Woodruff
---

diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 1ea91681926..9ec11443200 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -92,20 +92,20 @@ static struct irqaction omap2_gp_timer_irq = {
 
 static void __init omap2_gp_timer_init(void)
 {
-	struct clk * osc_ck;
+	struct clk * sys_ck;
 	u32 tick_period = 120000;
 	u32 l;
 
 	/* Reset clock and prescale value */
 	timer_write_reg(OS_TIMER_NR, GP_TIMER_TCLR, 0);
 
-	osc_ck = clk_get(NULL, "osc_ck");
-	if (IS_ERR(osc_ck))
-		printk(KERN_ERR "Could not get osc_ck\n");
+	sys_ck = clk_get(NULL, "sys_ck");
+	if (IS_ERR(sys_ck))
+		printk(KERN_ERR "Could not get sys_ck\n");
 	else {
-		clk_use(osc_ck);
-		tick_period = clk_get_rate(osc_ck) / 100;
-		clk_put(osc_ck);
+		clk_use(sys_ck);
+		tick_period = clk_get_rate(sys_ck) / 100;
+		clk_put(sys_ck);
 	}
 
 	tick_period /= 2;	/* Minimum prescale divider is 2 */