diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-17 20:03:39 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-17 20:03:39 +0000 |
| commit | cd4348339c21f4a15c01f3f120e92b3224a0a7da (patch) | |
| tree | d45fe54ca6d9bc2182943633d6649a417c5de675 /drivers/mmc | |
| parent | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (diff) | |
| parent | 917fa280e5e99edcae44a34feab295a59922d16c (diff) | |
| download | linux-3.10-cd4348339c21f4a15c01f3f120e92b3224a0a7da.tar.gz linux-3.10-cd4348339c21f4a15c01f3f120e92b3224a0a7da.tar.bz2 linux-3.10-cd4348339c21f4a15c01f3f120e92b3224a0a7da.zip | |
Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 1b9fc3c6b87..67d7b7fef08 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -1015,7 +1015,7 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data } if (is_read) { - if (host->id == 1) { + if (host->id == 0) { sync_dev = OMAP_DMA_MMC_RX; dma_dev_name = "MMC1 read"; } else { @@ -1023,7 +1023,7 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data dma_dev_name = "MMC2 read"; } } else { - if (host->id == 1) { + if (host->id == 0) { sync_dev = OMAP_DMA_MMC_TX; dma_dev_name = "MMC1 write"; } else { @@ -1317,7 +1317,7 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id) host->slots[id] = slot; mmc->caps = 0; - if (host->pdata->conf.wire4) + if (host->pdata->slots[id].wires >= 4) mmc->caps |= MMC_CAP_4_BIT_DATA; mmc->ops = &mmc_omap_ops; @@ -1451,6 +1451,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev) host->irq = irq; host->use_dma = 1; + host->dev->dma_mask = &pdata->dma_mask; host->dma_ch = -1; host->irq = irq; |