Skip to contentSkip to conversation

sh: sh7785 pll configuration from mode pin

PATCH New Magnus Damm 1 participant 1 message May 28, 2009 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: sh7785 pll configuration from mode pin

From: Magnus Damm <[email protected]>

This patch modifies the sh7785 clock code to use the MODE4 value to switch between 72x and 36x PLL multiplication.

---

 arch/sh/kernel/cpu/sh4a/clock-sh7785.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/sh/kernel/cpu/sh4a/clock-sh7785.c +6 -6
@@ -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 = {