aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-11-19 07:22:58 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 15:29:50 +0900
commite8ee13a818db4954517cea7da6e7c15b9656eb00 (patch)
treeee32ff1ae74411bc7475b07ab7c253462da43d60 /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff)
downloadlinux-dev-e8ee13a818db4954517cea7da6e7c15b9656eb00.tar.xz
linux-dev-e8ee13a818db4954517cea7da6e7c15b9656eb00.zip
ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable
Current FSIDIV clock framework had bogus disable. This patch remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/clock-sh7372.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 7db31e6c6bf2..13226323e4e0 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -453,10 +453,8 @@ static int fsidiv_enable(struct clk *clk)
unsigned long value;
value = __raw_readl(clk->mapping->base) >> 16;
- if (value < 2) {
- fsidiv_disable(clk);
+ if (value < 2)
return -ENOENT;
- }
__raw_writel((value << 16) | 0x3, clk->mapping->base);
@@ -468,11 +466,6 @@ static int fsidiv_set_rate(struct clk *clk,
{
int idx;
- if (clk->parent->rate == rate) {
- fsidiv_disable(clk);
- return 0;
- }
-
idx = (clk->parent->rate / rate) & 0xffff;
if (idx < 2)
return -ENOENT;