diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 14:23:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 14:23:55 -0700 |
| commit | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (patch) | |
| tree | f29b18c6e564e515212b6c88e89cf5770cc0f350 /drivers/mmc/omap.c | |
| parent | 94c12cc7d196bab34aaa98d38521549fa1e5ef76 (diff) | |
| parent | 2ed6d22cec37d9a3df4c5bacf1160dee7700106e (diff) | |
| download | op-kernel-dev-fecf3404f4aba6d0edeba31eeb018cbb6326dff2.zip op-kernel-dev-fecf3404f4aba6d0edeba31eeb018cbb6326dff2.tar.gz | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Don't check READY_FOR_DATA when reading
[MMC] MMC_CAP_BYTEBLOCK flag for non-log2 block sizes capable hosts
[MMC] Add multi block-write capability
[MMC] Remove data->blksz_bits member
[MMC] Convert mmci to use data->blksz rather than data->blksz_bits
Diffstat (limited to 'drivers/mmc/omap.c')
| -rw-r--r-- | drivers/mmc/omap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index ddf06b3..52c9e52 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -1034,13 +1034,14 @@ static int __init mmc_omap_probe(struct platform_device *pdev) host->irq = pdev->resource[1].start; host->base = (void __iomem*)IO_ADDRESS(r->start); - if (minfo->wire4) - mmc->caps |= MMC_CAP_4_BIT_DATA; - mmc->ops = &mmc_omap_ops; mmc->f_min = 400000; mmc->f_max = 24000000; mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34; + mmc->caps = MMC_CAP_BYTEBLOCK; + + if (minfo->wire4) + mmc->caps |= MMC_CAP_4_BIT_DATA; /* Use scatterlist DMA to reduce per-transfer costs. * NOTE max_seg_size assumption that small blocks aren't |
