Date: | 2009-12-01 12:37:38 (11 years 1 month ago) |
---|---|
Author: | Javi Roman |
Commit: | d21755a9eca889af74ceeb0eeb6473d1906c35f3 |
Message: | MMC delay patch from KeyStream |
Files: |
drivers/mmc/core/core.c (2 diffs) drivers/mmc/core/sdio_cis.c (2 diffs) |
Change Details
drivers/mmc/core/core.c | ||
---|---|---|
706 | 706 | * This delay should be sufficient to allow the power supply |
707 | 707 | * to reach the minimum voltage. |
708 | 708 | */ |
709 | mmc_delay(10); | |
709 | mmc_delay(200); | |
710 | 710 | |
711 | 711 | if (host->f_min > 400000) { |
712 | 712 | pr_warning("%s: Minimum clock frequency too high for " |
... | ... | |
722 | 722 | * This delay must be at least 74 clock sizes, or 1 ms, or the |
723 | 723 | * time required to reach a stable voltage. |
724 | 724 | */ |
725 | mmc_delay(10); | |
725 | mmc_delay(200); | |
726 | 726 | } |
727 | 727 | |
728 | 728 | static void mmc_power_off(struct mmc_host *host) |
drivers/mmc/core/sdio_cis.c | ||
---|---|---|
111 | 111 | card->cis.max_dtr = speed_val[(buf[3] >> 3) & 15] * |
112 | 112 | speed_unit[buf[3] & 7]; |
113 | 113 | |
114 | if(card->cis.max_dtr > 25000000 && card->cccr.sdio_vsn < SDIO_SDIO_REV_2_00) | |
115 | card->cis.max_dtr = 25000000; | |
116 | ||
114 | 117 | return 0; |
115 | 118 | } |
116 | 119 | |
... | ... | |
123 | 126 | vsn = func->card->cccr.sdio_vsn; |
124 | 127 | min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42; |
125 | 128 | |
129 | #if 0 | |
126 | 130 | if (size < min_size || buf[0] != 1) |
127 | 131 | return -EINVAL; |
132 | #endif | |
128 | 133 | |
129 | 134 | /* TPLFE_MAX_BLK_SIZE */ |
130 | 135 | func->max_blksize = buf[12] | (buf[13] << 8); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9