aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-06-02 09:22:02 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-06-11 09:08:53 +0300
commit0d4fdbb64f472ef31195714993f1263f77cf85ca (patch)
tree2cfa619828ac2430919b3d716635e9ebf6f00a47 /arch/sh/kernel
parent2693e2740ddae364a80e6083043ba760b6366b69 (diff)
sh: rework mode pin code
This patch reworks the mode pin code to keep the pin definitions in one place. The mode pins values are now the value of the bit instead of bit number. With this patch in place the sh7785 header file contains mode pin comments. The sh7785 clock code and the sh7785lcr board code are updated to reflect the new shared mode pins. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7785.c2
-rw-r--r--arch/sh/kernel/setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index dae20aca536..73abfbf2f16 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -32,7 +32,7 @@ static unsigned long pll_recalc(struct clk *clk)
{
int multiplier;
- multiplier = test_mode_pin(MODE_PIN_MODE4) ? 36 : 72;
+ multiplier = test_mode_pin(MODE_PIN4) ? 36 : 72;
return clk->parent->rate * multiplier;
}
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 050131eec77..dd38338553e 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -429,7 +429,7 @@ int generic_mode_pins(void)
int test_mode_pin(int pin)
{
- return sh_mv.mv_mode_pins() & (1 << pin);
+ return sh_mv.mv_mode_pins() & pin;
}
static const char *cpu_name[] = {