public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Dong Aisheng <b29396@freescale.com>
To: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, cjb@laptop.org,
	shawn.guo@linaro.org, s.hauer@pengutronix.de,
	b29396@freescale.com, ulf.hansson@linaro.org,
	adrian.hunter@intel.com, vladimir_zapolskiy@mentor.com,
	ed.sutter@alcatel-lucent.com
Subject: [PATCH 4/6] mmc: sdhci-esdhc-imx: set the correct max timeout value for uSDHC
Date: Tue, 10 Dec 2013 20:56:06 +0800	[thread overview]
Message-ID: <1386680168-5227-5-git-send-email-b29396@freescale.com> (raw)
In-Reply-To: <1386680168-5227-1-git-send-email-b29396@freescale.com>

The default sdhci driver write 0xE into timeout counter register to
set the maximum timeout. The value is not correct for uSDHC since the
max counter value for uSDHC is 0xF.
Instead of using common timeout code in sdhci, we implement esdhc_set_timeout
to handle the difference between eSDHC and uSDHC.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 97b35e1..c24cb23 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -868,6 +868,16 @@ unsigned int esdhc_get_max_timeout(struct sdhci_host *host)
 	return max_to / (esdhc_pltfm_get_max_clock(host) / 1000);
 }
 
+void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+{
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct pltfm_imx_data *imx_data = pltfm_host->priv;
+
+	/* use maximum timeout counter */
+	sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
+			SDHCI_TIMEOUT_CONTROL);
+}
+
 static struct sdhci_ops sdhci_esdhc_ops = {
 	.read_l = esdhc_readl_le,
 	.read_w = esdhc_readw_le,
@@ -881,6 +891,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
 	.platform_bus_width = esdhc_pltfm_bus_width,
 	.set_uhs_signaling = esdhc_set_uhs_signaling,
 	.get_max_timeout = esdhc_get_max_timeout,
+	.set_timeout = esdhc_set_timeout,
 };
 
 static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
-- 
1.7.2.rc3



  parent reply	other threads:[~2013-12-10 13:24 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-10 12:56 [PATCH 0/6] mmc: sdhci: a few fixes on timeout and max_discard_to Dong Aisheng
2013-12-10 12:56 ` [PATCH 1/6] mmc: sdhci: add platfrom get_max_timeout hook Dong Aisheng
2013-12-11  1:56   ` Shawn Guo
2013-12-11  3:00     ` Dong Aisheng
2013-12-11  3:12       ` Shawn Guo
2013-12-11  3:20         ` Dong Aisheng
2013-12-11  3:56           ` Shawn Guo
2013-12-11  4:59             ` Dong Aisheng
2013-12-11  5:55               ` Shawn Guo
2013-12-17  6:15                 ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 2/6] mmc: sdhci-esdhc-imx: fix incorrect max_discard_to for uSDHC Dong Aisheng
2013-12-11  1:58   ` Shawn Guo
2013-12-10 12:56 ` [PATCH 3/6] mmc: sdhci: add platform set_timeout hook Dong Aisheng
2013-12-11  2:16   ` Shawn Guo
2013-12-11  3:03     ` Dong Aisheng
2013-12-11  3:18       ` Shawn Guo
2013-12-11  3:35         ` Dong Aisheng
2013-12-11  3:48           ` Shawn Guo
2013-12-11  5:03             ` Dong Aisheng
2013-12-11  6:04               ` Shawn Guo
2013-12-17  6:49                 ` Dong Aisheng
2013-12-10 12:56 ` Dong Aisheng [this message]
2013-12-11  2:17   ` [PATCH 4/6] mmc: sdhci-esdhc-imx: set the correct max timeout value for uSDHC Shawn Guo
2013-12-11  3:08     ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 5/6] mmc: sdhci: calculate max_discard_to dynamically for SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK Dong Aisheng
2013-12-11  3:01   ` Shawn Guo
2013-12-11  3:13     ` Dong Aisheng
2013-12-11  4:05   ` Shawn Guo
2013-12-11  5:06     ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 6/6] mmc: sdhci-esdhc-imx: use actual_clock to calculate timeout Dong Aisheng

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=1386680168-5227-5-git-send-email-b29396@freescale.com \
    --to=b29396@freescale.com \
    --cc=adrian.hunter@intel.com \
    --cc=cjb@laptop.org \
    --cc=ed.sutter@alcatel-lucent.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawn.guo@linaro.org \
    --cc=ulf.hansson@linaro.org \
    --cc=vladimir_zapolskiy@mentor.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox