linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 13/14] i2c: imx: add clk_prepare/clk_unprepare
Date: Fri, 11 Nov 2011 18:50:36 +0800	[thread overview]
Message-ID: <1321008637-19999-14-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1321008637-19999-1-git-send-email-richard.zhao@linaro.org>

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
 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,
-- 
1.7.5.4

  parent reply	other threads:[~2011-11-11 10:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 10:50 [PATCH V3 00/14] add clk_prepare/clk_unprepare to imx drivers Richard Zhao
2011-11-11 10:50 ` [PATCH V3 01/14] clk: add helper functions clk_prepare_enable and clk_disable_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 02/14] ARM: mxc: time: add clk_prepare/clk_unprepare Richard Zhao
2011-11-11 10:50 ` [PATCH V3 03/14] ARM: mxc: ahci: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 04/14] ARM: mxc: pwm: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 05/14] ARM: mxc: epit: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 06/14] ARM: mxc: arch_reset: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 07/14] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 08/14] ARM: pm-imx5: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 09/14] ARM: mx31moboard: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 10/14] ARM: mxs: " Richard Zhao
2011-12-19 22:21   ` Marek Vasut
2011-12-20  0:56     ` Richard Zhao
2011-12-20  2:15   ` Shawn Guo
2011-11-11 10:50 ` [PATCH V3 11/14] serial: imx: " Richard Zhao
2011-11-11 10:50 ` [PATCH V3 12/14] net: fec: " Richard Zhao
2011-11-11 10:50 ` Richard Zhao [this message]
2011-11-11 10:50 ` [PATCH V3 14/14] mmc: sdhci-esdhc-imx: " Richard Zhao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1321008637-19999-14-git-send-email-richard.zhao@linaro.org \
    --to=richard.zhao@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).