From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <chris@printf.net>
Cc: linux-mmc <linux-mmc@vger.kernel.org>
Subject: [PATCH 11/13] mmc: sdhci: Let a driver override timeout clock frequency
Date: Mon, 22 Sep 2014 13:17:42 +0300 [thread overview]
Message-ID: <1411381064-1703-12-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1411381064-1703-1-git-send-email-adrian.hunter@intel.com>
Let a driver override the timeout clock frequency by
populating it before calling sdhci_add_host(). Note
the value will otherwise be zero because sdhci_host is
zeroed when allocated.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d20d104..8588550 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2790,6 +2790,7 @@ int sdhci_add_host(struct sdhci_host *host)
u32 caps[2] = {0, 0};
u32 max_current_caps;
unsigned int ocr_avail;
+ unsigned int override_timeout_clk;
int ret;
WARN_ON(host == NULL);
@@ -2803,6 +2804,8 @@ int sdhci_add_host(struct sdhci_host *host)
if (debug_quirks2)
host->quirks2 = debug_quirks2;
+ override_timeout_clk = host->timeout_clk;
+
sdhci_do_reset(host, SDHCI_RESET_ALL);
host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
@@ -2971,6 +2974,9 @@ int sdhci_add_host(struct sdhci_host *host)
mmc->max_busy_timeout /= host->timeout_clk;
}
+ if (override_timeout_clk)
+ host->timeout_clk = override_timeout_clk;
+
mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
--
1.8.3.2
next prev parent reply other threads:[~2014-09-22 10:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 10:17 [PATCH 00/13] mmc: Some Braswell and misc patches Adrian Hunter
2014-09-22 10:17 ` [PATCH 01/13] mmc: Fix use of wrong device in mmc_gpiod_free_cd() Adrian Hunter
2014-09-22 10:17 ` [PATCH 02/13] mmc: Fix incorrect warning when setting 0 Hz via debugfs Adrian Hunter
2014-09-22 10:17 ` [PATCH 03/13] mmc: It is not an error for the card to be removed while suspended Adrian Hunter
2014-09-22 10:17 ` [PATCH 04/13] mmc: block: Fix error recovery stop cmd timeout calculation Adrian Hunter
2014-09-22 10:17 ` [PATCH 05/13] mmc: block: Fix SD card stop cmd response type Adrian Hunter
2014-09-22 10:17 ` [PATCH 06/13] mmc: sdhci: Add quirk for always getting TC with stop cmd Adrian Hunter
2014-09-22 10:17 ` [PATCH 07/13] mmc: sdhci-acpi: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel host controllers Adrian Hunter
2014-09-22 10:17 ` [PATCH 08/13] mmc: sdhci-acpi: Add a HID and UID for a SD Card host controller Adrian Hunter
2014-09-22 10:17 ` [PATCH 09/13] mmc: sdhci-pci: Set SDHCI_QUIRK2_STOP_WITH_TC for Intel BYT host controllers Adrian Hunter
2014-09-22 10:17 ` [PATCH 10/13] mmc: sdhci-pci: Add Bay Trail and Braswell SD card detect Adrian Hunter
2014-09-22 10:17 ` Adrian Hunter [this message]
2014-09-22 10:17 ` [PATCH 12/13] mmc: sdhci-pci: Fix Braswell eMMC timeout clock frequency Adrian Hunter
2014-09-22 10:17 ` [PATCH 13/13] mmc: sdhci: Transfer Complete has higher priority than Data Timeout Error Adrian Hunter
2014-09-23 7:34 ` [PATCH 00/13] mmc: Some Braswell and misc patches Ulf Hansson
2014-09-24 7:45 ` Adrian Hunter
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=1411381064-1703-12-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=chris@printf.net \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.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