From 31f6b832560c61fbcf6e038e568d32d5d2a6c566 Mon Sep 17 00:00:00 2001
From: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Date: Thu, 15 May 2008 17:44:00 +0900
Subject: [PATCH] --- yaml --- r: 96964 b: refs/heads/master c:
 65b83427c6e5814556855c42bf9b4edeafd66623 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1ed6e42f355..a5a7873bbb3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561c2bccc7c5cf3d42f38f1f4d61c7b609d4631e
+refs/heads/master: 65b83427c6e5814556855c42bf9b4edeafd66623
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index 805535aa505e..27fa81bef6a0 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18,
 
 static void master_clk_init(struct clk *clk)
 {
-	clk->rate *= 36;
+	clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f];
 }
 
 static struct clk_ops sh7785_master_clk_ops = {