From patchwork Tue Nov 15 06:48:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5138 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0A4FE23E10 for ; Tue, 15 Nov 2011 06:49:14 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id ECB4CA18223 for ; Tue, 15 Nov 2011 06:49:13 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so111371faa.11 for ; Mon, 14 Nov 2011 22:49:13 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr16028192lab.40.1321339753737; Mon, 14 Nov 2011 22:49:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs27872lal; Mon, 14 Nov 2011 22:49:13 -0800 (PST) Received: by 10.68.10.138 with SMTP id i10mr26543733pbb.92.1321339751342; Mon, 14 Nov 2011 22:49:11 -0800 (PST) Received: from VA3EHSOBE009.bigfish.com (mail-va3.bigfish.com. [216.32.180.10]) by mx.google.com with ESMTPS id w7si29634907pbb.162.2011.11.14.22.49.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Nov 2011 22:49:11 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.180.10; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.10 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail103-va3-R.bigfish.com (10.7.14.242) by VA3EHSOBE009.bigfish.com (10.7.40.29) with Microsoft SMTP Server id 14.1.225.22; Tue, 15 Nov 2011 06:48:39 +0000 Received: from mail103-va3 (localhost [127.0.0.1]) by mail103-va3-R.bigfish.com (Postfix) with ESMTP id D4FB71C03FF; Tue, 15 Nov 2011 06:52:44 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h63h) X-Spam-TCS-SCL: 2:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail103-va3 (localhost.localdomain [127.0.0.1]) by mail103-va3 (MessageSwitch) id 1321339964631432_17196; Tue, 15 Nov 2011 06:52:44 +0000 (UTC) Received: from VA3EHSMHS022.bigfish.com (unknown [10.7.14.240]) by mail103-va3.bigfish.com (Postfix) with ESMTP id 90DFF60046; Tue, 15 Nov 2011 06:52:44 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS022.bigfish.com (10.7.99.32) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 15 Nov 2011 06:48:38 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Tue, 15 Nov 2011 00:49:08 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAF6mDVV025706; Tue, 15 Nov 2011 00:49:04 -0600 (CST) From: Richard Zhao To: , , , , CC: , , , , , , , Subject: [PATCH V4 13/14] i2c: imx: add clk_prepare/clk_unprepare Date: Tue, 15 Nov 2011 14:48:08 +0800 Message-ID: <1321339689-25256-14-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321339689-25256-1-git-send-email-richard.zhao@linaro.org> References: <1321339689-25256-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com It's for migrating to generic clk framework API. Signed-off-by: Richard Zhao --- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 58832e5..8d1ab6f 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -196,7 +196,7 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx) dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); - clk_enable(i2c_imx->clk); + clk_prepare_enable(i2c_imx->clk); writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR); /* Enable I2C controller */ writeb(0, i2c_imx->base + IMX_I2C_I2SR); @@ -245,7 +245,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) /* Disable I2C controller */ writeb(0, i2c_imx->base + IMX_I2C_I2CR); - clk_disable(i2c_imx->clk); + clk_disable_unprepare(i2c_imx->clk); } static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,