From d51be146cd722b4193187ef1ab27a52d761a97b6 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Thu, 28 May 2009 12:06:17 +0000
Subject: [PATCH] --- yaml --- r: 146847 b: refs/heads/master c:
 1823f6d5e6b81cca6542ed2e5f30d2556aad0f67 h: refs/heads/master i:   146845:
 44a9638d6e2bbc4e02b64c4d2c144f82a8977dff   146843:
 615773a7a660266610b26ca7cc30e0a2cba7d4fb   146839:
 c0c0a14f292c9b3960bb32a861127cb442fae2db   146831:
 397b70ca4c9b2006492c2d2256bf893b67dcefe0   146815:
 fa0857f9688ed09e55eb22c19a29bfdb47d01452 v: v3

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

diff --git a/[refs] b/[refs]
index 06a92f2e0095..f038ddcd5777 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63d12e23235d982d8f55696e09b2ff91e3ba0042
+refs/heads/master: 1823f6d5e6b81cca6542ed2e5f30d2556aad0f67
diff --git a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index a4a9bcbec664..705b023f8220 100644
--- a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -16,6 +16,7 @@
 #include <linux/cpufreq.h>
 #include <asm/clock.h>
 #include <asm/freq.h>
+#include <cpu/sh7785.h>
 
 static unsigned int div2[] = { 1, 2, 4, 6, 8, 12, 16, 18,
 			       24, 32, 36, 48 };
@@ -80,12 +81,11 @@ static struct clk_ops frqmr_clk_ops = {
 
 static unsigned long pll_recalc(struct clk *clk)
 {
-	/*
-	 * XXX: PLL1 multiplier is locked for the default clock mode,
-	 * when mode pin detection and configuration support is added,
-	 * select the multiplier dynamically.
-	 */
-	return clk->parent->rate * 36;
+	int multiplier;
+
+	multiplier = test_mode_pin(MODE_PIN_MODE4) ? 36 : 72;
+
+	return clk->parent->rate * multiplier;
 }
 
 static struct clk_ops pll_clk_ops = {