linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linuxzsc@gmail.com (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] i2c: imx: disable clock when it's possible to save power.
Date: Thu,  1 Oct 2009 09:13:33 +0800	[thread overview]
Message-ID: <1254359613-21210-4-git-send-email-linuxzsc@gmail.com> (raw)
In-Reply-To: <1254359613-21210-3-git-send-email-linuxzsc@gmail.com>

Enable clock before START, disable it after STOP.

Signed-off-by: Richard Zhao <linuxzsc@gmail.com>

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 87faea4..72ddea3 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -120,6 +120,7 @@ struct imx_i2c_struct {
 	wait_queue_head_t	queue;
 	unsigned long		i2csr;
 	unsigned int 		disable_delay;
+	unsigned int		ifdr; /* IMX_I2C_IFDR */
 };
 
 /** Functions for IMX I2C adapter driver ***************************************
@@ -210,6 +211,8 @@ 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);
+	writeb(i2c_imx->ifdr, i2c_imx->base + IMX_I2C_IFDR);
 	/* Enable I2C controller */
 	writeb(0, i2c_imx->base + IMX_I2C_I2SR);
 	writeb(I2CR_IEN, i2c_imx->base + IMX_I2C_I2CR);
@@ -254,6 +257,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);
 }
 
 static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
@@ -273,8 +277,8 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
 	else
 		for (i = 0; i2c_clk_div[i][0] < div; i++);
 
-	/* Write divider value to register */
-	writeb(i2c_clk_div[i][1], i2c_imx->base + IMX_I2C_IFDR);
+	/* Store divider value */
+	i2c_imx->ifdr = i2c_clk_div[i][1];
 
 	if (cpu_is_mx1()) {
 		/*
@@ -555,7 +559,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "can't get I2C clock\n");
 		goto fail3;
 	}
-	clk_enable(i2c_imx->clk);
 
 	/* Request IRQ */
 	ret = request_irq(i2c_imx->irq, i2c_imx_isr, 0, pdev->name, i2c_imx);
@@ -604,7 +607,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
 fail5:
 	free_irq(i2c_imx->irq, i2c_imx);
 fail4:
-	clk_disable(i2c_imx->clk);
 	clk_put(i2c_imx->clk);
 fail3:
 	release_mem_region(i2c_imx->res->start, resource_size(res));
@@ -641,8 +643,6 @@ static int __exit i2c_imx_remove(struct platform_device *pdev)
 	if (pdata && pdata->exit)
 		pdata->exit(&pdev->dev);
 
-	/* Disable I2C clock */
-	clk_disable(i2c_imx->clk);
 	clk_put(i2c_imx->clk);
 
 	release_mem_region(i2c_imx->res->start, resource_size(i2c_imx->res));
-- 
1.6.0.4

  reply	other threads:[~2009-10-01  1:13 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-01  1:13 [PATCH 1/4] i2c: imx: check busy bit when START/STOP Richard Zhao
2009-10-01  1:13 ` [PATCH 2/4] i2c: imx: only imx1 needs disable delay Richard Zhao
2009-10-01  1:13   ` [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Richard Zhao
2009-10-01  1:13     ` Richard Zhao [this message]
2009-10-01  7:34       ` [PATCH 4/4] i2c: imx: disable clock when it's possible to save power Sascha Hauer
2009-10-01  7:56         ` Richard Zhao
2009-10-01  8:00           ` Sascha Hauer
2009-10-04 12:30             ` Richard Zhao
2009-10-01  7:29     ` [PATCH 3/4] i2c: imx: add macros and printk to make debug easy Sascha Hauer
2009-10-01  8:01       ` Richard Zhao
2009-10-01  8:26         ` Sascha Hauer
2009-10-01  9:30           ` Richard Zhao
2009-10-04 12:23             ` Richard Zhao
2009-10-01  7:26   ` [PATCH 2/4] i2c: imx: only imx1 needs disable delay Sascha Hauer
2009-10-01  7:52     ` Richard Zhao
2009-10-01  7:57       ` Sascha Hauer
2009-10-01  8:03 ` [PATCH 1/4] i2c: imx: check busy bit when START/STOP Richard Zhao
2009-10-01  8:38   ` Sascha Hauer
2009-10-01  9:11     ` Richard Zhao
2009-10-01  9:52       ` Sascha Hauer
2009-10-01 14:54         ` Richard Zhao
2009-10-01 16:37           ` Wolfram Sang
2009-10-02  0:57             ` Richard Zhao
2009-10-02  7:26               ` Sascha Hauer
2009-10-02  8:17                 ` Richard Zhao
2009-10-02 14:11                   ` Wolfram Sang
2009-10-04 12:22                     ` 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=1254359613-21210-4-git-send-email-linuxzsc@gmail.com \
    --to=linuxzsc@gmail.com \
    --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).