Skip to content

Commit f9cf94e

Browse files
aakoskingregkh
authored andcommitted
mmc: omap: fix the maximum timeout setting
[ Upstream commit a6327b5 ] When running OMAP1 kernel on QEMU, MMC access is annoyingly noisy: MMC: CTO of 0xff and 0xfe cannot be used! MMC: CTO of 0xff and 0xfe cannot be used! MMC: CTO of 0xff and 0xfe cannot be used! [ad inf.] Emulator warnings appear to be valid. The TI document SPRU680 [1] ("OMAP5910 Dual-Core Processor MultiMedia Card/Secure Data Memory Card (MMC/SD) Reference Guide") page 36 states that the maximum timeout is 253 cycles and "0xff and 0xfe cannot be used". Fix by using 0xfd as the maximum timeout. Tested using QEMU 2.5 (Siemens SX1 machine, OMAP310), and also checked on real hardware using Palm TE (OMAP310), Nokia 770 (OMAP1710) and Nokia N810 (OMAP2420) that MMC works as before. [1] http://www.ti.com/lit/ug/spru680/spru680.pdf Fixes: 730c9b7 ("[MMC] Add OMAP MMC host driver") Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Ulf Hansson <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 895927d commit f9cf94e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/mmc/host/omap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ static inline void set_cmd_timeout(struct mmc_omap_host *host, struct mmc_reques
920920
reg &= ~(1 << 5);
921921
OMAP_MMC_WRITE(host, SDIO, reg);
922922
/* Set maximum timeout */
923-
OMAP_MMC_WRITE(host, CTO, 0xff);
923+
OMAP_MMC_WRITE(host, CTO, 0xfd);
924924
}
925925

926926
static inline void set_data_timeout(struct mmc_omap_host *host, struct mmc_request *req)

0 commit comments

Comments
 (0)