From patchwork Fri Dec 3 04:16:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 376721 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 oB34GTjX018350 for ; Fri, 3 Dec 2010 04:17:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758464Ab0LCERB (ORCPT ); Thu, 2 Dec 2010 23:17:01 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:39177 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758461Ab0LCERB (ORCPT ); Thu, 2 Dec 2010 23:17:01 -0500 Received: by mail-pv0-f174.google.com with SMTP id 4so1379445pva.19 for ; Thu, 02 Dec 2010 20:17:01 -0800 (PST) Received: by 10.142.134.4 with SMTP id h4mr1372298wfd.4.1291349821090; Thu, 02 Dec 2010 20:17:01 -0800 (PST) Received: from localhost.localdomain (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id x18sm1655077wfa.23.2010.12.02.20.16.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 02 Dec 2010 20:17:00 -0800 (PST) From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org Cc: lethal@linux-sh.org, Nobuhiro Iwamatsu Subject: [PATCH 2/2] sh: se/7724: Update clock of FSI to non-legacy Date: Fri, 3 Dec 2010 13:16:57 +0900 Message-Id: <1291349817-3077-2-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1291349817-3077-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1291349817-3077-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> 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, 03 Dec 2010 04:17:02 +0000 (UTC) diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index c31d228..88ea26a 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -288,7 +288,7 @@ static struct platform_device ceu1_device = { * So, we should change parent of fsi */ #define FCLKACR 0xa4150008 -static void fsimck_init(struct clk *clk) +static int fsimck_enable(struct clk *clk) { u32 status = __raw_readl(clk->enable_reg); @@ -296,10 +296,22 @@ static void fsimck_init(struct clk *clk) status &= ~0x000000ff; status |= 0x00000080; __raw_writel(status, clk->enable_reg); + + return 0; +} + +static void fsimck_disable(struct clk *clk) +{ + u32 status = __raw_readl(clk->enable_reg); + + /* use external clock */ + status &= ~0x00000080; + __raw_writel(status, clk->enable_reg); } static struct clk_ops fsimck_clk_ops = { - .init = fsimck_init, + .enable = fsimck_enable, + .disable = fsimck_disable, }; static struct clk fsimcka_clk = {