From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 24 Dec 2010 03:15:57 +0000 (+0900)
Subject: sh: Fix up SH7201 clkfwk build.
X-Git-Tag: v5.15~27193^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27f1acccd4d310e941d2e879445324595e2fe463;p=platform%2Fkernel%2Flinux-starfive.git

sh: Fix up SH7201 clkfwk build.

The master clock initialization for SH7201 was wholly bogus. Users of the
legacy API must initialize the clock rate through the struct clk itself
rather than returning the clock frequency. Given that the init function
itself is void, returning the frequency isn't terribly effective.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
index b26264dc2aef..c509c40cba4b 100644
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
@@ -34,7 +34,7 @@ static const int pfc_divisors[]={1,2,3,4,6,8,12};
 
 static void master_clk_init(struct clk *clk)
 {
-	return 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];
+	clk->rate = 10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];
 }
 
 static struct clk_ops sh7201_master_clk_ops = {