1 --- a/drivers/mmc/core/sd.c
2 +++ b/drivers/mmc/core/sd.c
3 @@ -263,6 +263,15 @@ static int mmc_switch_hs(struct mmc_card
8 + * Some SDHC cards, notably those with a Sandisk SD controller
9 + * (also found in Kingston products) need a bit of slack
10 + * before successfully handling the SWITCH command. So far,
11 + * cards identifying themselves as "SD04G" and "SD08G" are
16 err = mmc_sd_switch(card, 1, 0, 1, status);
19 --- a/drivers/mmc/host/mvsdio.c
20 +++ b/drivers/mmc/host/mvsdio.c
21 @@ -620,9 +620,11 @@ static void mvsd_set_ios(struct mmc_host
22 if (ios->bus_width == MMC_BUS_WIDTH_4)
23 ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS;
26 if (ios->timing == MMC_TIMING_MMC_HS ||
27 ios->timing == MMC_TIMING_SD_HS)
28 ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
31 host->ctrl = ctrl_reg;
32 mvsd_write(MVSD_HOST_CTRL, ctrl_reg);
33 --- a/drivers/mmc/core/core.c
34 +++ b/drivers/mmc/core/core.c
35 @@ -286,9 +286,9 @@ void mmc_set_data_timeout(struct mmc_dat
36 * The limit is really 250 ms, but that is
37 * insufficient for some crappy cards.
46 * SDHC cards always use these fixed values.