mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 16:54:03 +02:00
16b0a08bad
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16249 3c298f89-4303-0410-b956-a3cf2f4a3e73
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
--- a/drivers/mmc/core/sd.c
|
|
+++ b/drivers/mmc/core/sd.c
|
|
@@ -263,6 +263,15 @@ static int mmc_switch_hs(struct mmc_card
|
|
return -ENOMEM;
|
|
}
|
|
|
|
+ /*
|
|
+ * Some SDHC cards, notably those with a Sandisk SD controller
|
|
+ * (also found in Kingston products) need a bit of slack
|
|
+ * before successfully handling the SWITCH command. So far,
|
|
+ * cards identifying themselves as "SD04G" and "SD08G" are
|
|
+ * affected
|
|
+ */
|
|
+ udelay(1000);
|
|
+
|
|
err = mmc_sd_switch(card, 1, 0, 1, status);
|
|
if (err)
|
|
goto out;
|
|
--- a/drivers/mmc/host/mvsdio.c
|
|
+++ b/drivers/mmc/host/mvsdio.c
|
|
@@ -620,9 +620,11 @@ static void mvsd_set_ios(struct mmc_host
|
|
if (ios->bus_width == MMC_BUS_WIDTH_4)
|
|
ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS;
|
|
|
|
+#if 0
|
|
if (ios->timing == MMC_TIMING_MMC_HS ||
|
|
ios->timing == MMC_TIMING_SD_HS)
|
|
ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
|
|
+#endif
|
|
|
|
host->ctrl = ctrl_reg;
|
|
mvsd_write(MVSD_HOST_CTRL, ctrl_reg);
|
|
--- a/drivers/mmc/core/core.c
|
|
+++ b/drivers/mmc/core/core.c
|
|
@@ -286,9 +286,9 @@ void mmc_set_data_timeout(struct mmc_dat
|
|
* The limit is really 250 ms, but that is
|
|
* insufficient for some crappy cards.
|
|
*/
|
|
- limit_us = 300000;
|
|
+ limit_us = 500000;
|
|
else
|
|
- limit_us = 100000;
|
|
+ limit_us = 200000;
|
|
|
|
/*
|
|
* SDHC cards always use these fixed values.
|