aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core
diff options
context:
space:
mode:
authorWolfgang Muees <wolfgang.mues@auerswald.de>2009-03-11 14:28:39 +0100
committerPierre Ossman <drzeus@drzeus.cx>2009-03-24 21:30:02 +0100
commitc0c88871574ccb4ee53dde1bbb678931b38ed47b (patch)
tree5b820a07f99534f36867bc7ae1b01e427dcf086a /drivers/mmc/core
parentea15ba5cd7bb370902cd9f6a73c2d288bfba6b2c (diff)
downloadkernel_samsung_espresso10-c0c88871574ccb4ee53dde1bbb678931b38ed47b.zip
kernel_samsung_espresso10-c0c88871574ccb4ee53dde1bbb678931b38ed47b.tar.gz
kernel_samsung_espresso10-c0c88871574ccb4ee53dde1bbb678931b38ed47b.tar.bz2
mmc_spi: allow higher timeouts for SPI mode
Some SD cards have very high timeouts in SPI mode. So adjust the timeouts from theory to practice. Signed-off-by: Wolfgang Muees <wolfgang.mues@auerswald.de> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r--drivers/mmc/core/core.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 4a18d90..5c83c67 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -297,6 +297,21 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
data->timeout_clks = 0;
}
}
+ /*
+ * Some cards need very high timeouts if driven in SPI mode.
+ * The worst observed timeout was 900ms after writing a
+ * continuous stream of data until the internal logic
+ * overflowed.
+ */
+ if (mmc_host_is_spi(card->host)) {
+ if (data->flags & MMC_DATA_WRITE) {
+ if (data->timeout_ns < 1000000000)
+ data->timeout_ns = 1000000000; /* 1s */
+ } else {
+ if (data->timeout_ns < 100000000)
+ data->timeout_ns = 100000000; /* 100ms */
+ }
+ }
}
EXPORT_SYMBOL(mmc_set_data_timeout);