Skip to content

Commit

Permalink
sh: sh7785 pll configuration from mode pin
Browse files Browse the repository at this point in the history
This patch modifies the sh7785 clock code to use the MODE4
value to switch between 72x and 36x PLL multiplication.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jun 1, 2009
1 parent 63d12e2 commit 1823f6d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/sh/kernel/cpu/sh4a/clock-sh7785.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 1823f6d

Please sign in to comment.