Bump 2.6.30 kernel version to final
[oweals/openwrt.git] / target / linux / kirkwood / patches / 002-mvsdio_delay.patch
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
4                 return -ENOMEM;
5         }
6  
7 +       /*
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
12 +        * affected
13 +        */
14 +       udelay(1000);
15 +
16         err = mmc_sd_switch(card, 1, 0, 1, status);
17         if (err)
18                 goto out;
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;
24  
25 +#if 0
26         if (ios->timing == MMC_TIMING_MMC_HS ||
27             ios->timing == MMC_TIMING_SD_HS)
28                 ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
29 +#endif
30  
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.
38                          */
39 -                       limit_us = 300000;
40 +                       limit_us = 500000;
41                 else
42 -                       limit_us = 100000;
43 +                       limit_us = 200000;
44  
45                 /*
46                  * SDHC cards always use these fixed values.