From patchwork Fri Nov 19 07:22:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 338621 X-Patchwork-Delegate: lethal@linux-sh.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAJ7LThS014204 for ; Fri, 19 Nov 2010 07:23:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751198Ab0KSHXK (ORCPT ); Fri, 19 Nov 2010 02:23:10 -0500 Received: from mail.renesas.com ([202.234.163.13]:39507 "EHLO mail02.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750912Ab0KSHXJ (ORCPT ); Fri, 19 Nov 2010 02:23:09 -0500 X-AuditID: ac140385-00000004000061c5-1d-4ce625d16475 Received: from guardian05.idc.renesas.com ([172.20.8.207]) by mail02.idc.renesas.com (sendmail) with ESMTP id oAJ7MvW3022440; Fri, 19 Nov 2010 16:22:57 +0900 (JST) Received: (from root@localhost) by guardian05.idc.renesas.com with id oAJ7Mwmj017760; Fri, 19 Nov 2010 16:22:58 +0900 (JST) Received: from mta03.idc.renesas.com (localhost [127.0.0.1]) by mta03.idc.renesas.com with ESMTP id oAJ7MxpG015056; Fri, 19 Nov 2010 16:22:59 +0900 (JST) Received: from PG10870.renesas.com ([172.30.8.159]) by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0LC4003PIF6A3X@ims05.idc.renesas.com>; Fri, 19 Nov 2010 16:22:58 +0900 (JST) Date: Fri, 19 Nov 2010 16:22:58 +0900 (JST) Date-warning: Date header was inserted by ims05.idc.renesas.com From: Kuninori Morimoto From: Kuninori Morimoto Subject: [PATCH 1/6] ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable In-reply-to: To: Paul Mundt Cc: Mark Brown , Magnus , Linux-SH , Liam Girdwood , Guennadi Message-id: MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-2022-JP-2?B?U2Fuag==?= =?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.6 Emacs/23.2 (i386-mingw-nt5.1.2600) MULE/6.0 (HANACHIRUSATO) References: X-Brightmail-Tracker: AAAAAA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 19 Nov 2010 07:23:11 +0000 (UTC) diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index 7db31e6..1322632 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;