All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wolfram Sang <wsa@the-dreams.de>
To: linux-mmc@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
	linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org,
	Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>,
	Magnus Damm <magnus.damm@gmail.com>,
	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
	Dirk Behme <dirk.behme@gmail.com>
Subject: [PATCH 4/9] mmc: tmio: add flag to reduce delay after changing clock status
Date: Mon, 25 Jan 2016 19:15:11 +0000	[thread overview]
Message-ID: <1453749316-1848-5-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1453749316-1848-1-git-send-email-wsa@the-dreams.de>

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

The docs for RCar Gen2 & 3 I have access to, mention delays of 5ms after
stop and 1ms after start. Make it possible to apply these values.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/mmc/host/tmio_mmc_pio.c | 7 ++++---
 include/linux/mfd/tmio.h        | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index a10fde40b6c3dd..ffff687e98b1e3 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -172,7 +172,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
 		host->set_clk_div(host->pdev, (clk>>22) & 1);
 
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & 0x1ff);
-	msleep(10);
+	if (!(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG))
+		msleep(10);
 }
 
 static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
@@ -185,14 +186,14 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
 
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~0x0100 &
 		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
-	msleep(10);
+	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 5 : 10);
 }
 
 static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
 {
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |
 		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
-	msleep(10);
+	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 1 : 10);
 
 	/* implicit BUG_ON(!res) */
 	if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 24b86d538e8852..05d58ee5e6a78f 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -65,6 +65,10 @@
  * Some controllers can support SDIO IRQ signalling.
  */
 #define TMIO_MMC_SDIO_IRQ		(1 << 2)
+
+/* Some controllers don't need to wait 10ms for clock changes */
+#define TMIO_MMC_FAST_CLK_CHG		(1 << 3)
+
 /*
  * Some controllers require waiting for the SD bus to become
  * idle before writing to some registers.
-- 
2.1.4


WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa@the-dreams.de>
To: linux-mmc@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
	linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org,
	Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>,
	Magnus Damm <magnus.damm@gmail.com>,
	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
	Dirk Behme <dirk.behme@gmail.com>
Subject: [PATCH 4/9] mmc: tmio: add flag to reduce delay after changing clock status
Date: Mon, 25 Jan 2016 20:15:11 +0100	[thread overview]
Message-ID: <1453749316-1848-5-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1453749316-1848-1-git-send-email-wsa@the-dreams.de>

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

The docs for RCar Gen2 & 3 I have access to, mention delays of 5ms after
stop and 1ms after start. Make it possible to apply these values.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/mmc/host/tmio_mmc_pio.c | 7 ++++---
 include/linux/mfd/tmio.h        | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index a10fde40b6c3dd..ffff687e98b1e3 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -172,7 +172,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
 		host->set_clk_div(host->pdev, (clk>>22) & 1);
 
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & 0x1ff);
-	msleep(10);
+	if (!(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG))
+		msleep(10);
 }
 
 static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
@@ -185,14 +186,14 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
 
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~0x0100 &
 		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
-	msleep(10);
+	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 5 : 10);
 }
 
 static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
 {
 	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |
 		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
-	msleep(10);
+	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 1 : 10);
 
 	/* implicit BUG_ON(!res) */
 	if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 24b86d538e8852..05d58ee5e6a78f 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -65,6 +65,10 @@
  * Some controllers can support SDIO IRQ signalling.
  */
 #define TMIO_MMC_SDIO_IRQ		(1 << 2)
+
+/* Some controllers don't need to wait 10ms for clock changes */
+#define TMIO_MMC_FAST_CLK_CHG		(1 << 3)
+
 /*
  * Some controllers require waiting for the SD bus to become
  * idle before writing to some registers.
-- 
2.1.4


  parent reply	other threads:[~2016-01-25 19:15 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25 19:15 [PATCH 0/9] mmc: sdhi: some refactoring and adding basic r8a7795 support Wolfram Sang
2016-01-25 19:15 ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 1/9] mmc: tmio_dma: remove debug messages with little information Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 2/9] mmc: sdhi: Add EXT_ACC register busy check Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 3/9] mmc: sdhi: error message on ENOMEM is superfluous Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` Wolfram Sang [this message]
2016-01-25 19:15   ` [PATCH 4/9] mmc: tmio: add flag to reduce delay after changing clock status Wolfram Sang
2016-01-25 19:15 ` [PATCH 5/9] mmc: tmio: remove stale comments Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 6/9] mmc: sdhi: use faster clock handling on RCar Gen2 Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 7/9] mmc: tmio: refactor set_clock a little Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 8/9] mmc: tmio: disable clock before changing it Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-25 19:15 ` [PATCH 9/9] mmc: sdhi: Add r8a7795 support Wolfram Sang
2016-01-25 19:15   ` Wolfram Sang
2016-01-29 11:40   ` Ulf Hansson
2016-01-29 11:40     ` Ulf Hansson
2016-02-10 16:36     ` Wolfram Sang
2016-02-10 16:36       ` Wolfram Sang
2016-02-10 18:43       ` Ulf Hansson
2016-02-10 18:43         ` Ulf Hansson
2016-02-11  0:07         ` Wolfram Sang
2016-02-11  0:07           ` Wolfram Sang
2016-02-11  9:00           ` Ulf Hansson
2016-02-11  9:00             ` Ulf Hansson
2016-02-11 13:32             ` Wolfram Sang
2016-02-11 13:32               ` Wolfram Sang
2016-02-11 14:30               ` Ulf Hansson
2016-02-11 14:30                 ` Ulf Hansson
2016-01-29 11:40 ` [PATCH 0/9] mmc: sdhi: some refactoring and adding basic " Ulf Hansson
2016-01-29 11:40   ` Ulf Hansson
2016-02-02 14:06   ` Wolfram Sang
2016-02-02 14:06     ` Wolfram Sang
2016-02-02 14:50     ` Ulf Hansson
2016-02-02 14:50       ` Ulf Hansson
2016-02-02 14:59       ` Wolfram Sang
2016-02-02 14:59         ` Wolfram Sang

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=1453749316-1848-5-git-send-email-wsa@the-dreams.de \
    --to=wsa@the-dreams.de \
    --cc=dirk.behme@gmail.com \
    --cc=kuninori.morimoto.gx@gmail.com \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=yoshihiro.shimoda.uh@renesas.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.