diff mbox

[v5] DaVinci: MMC: MMC/SD controller driver for DaVinci family.

Message ID 871votjtfz.fsf@deeprootsystems.com (mailing list archive)
State Awaiting Upstream
Headers show

Commit Message

Kevin Hilman July 6, 2009, 11:13 p.m. UTC 
Pierre,

Vipin Bhandari <vipin.bhandari@ti.com> writes:

> This patch adds support for MMC/SD controller driver for all DaVinci family
> SoC. This patch supports davinci family SoC's DM6446, DM355, DM365 and
> DA830/OMAPL137.
>
> The patch has been tested on DM355 EVM.
>
> The MMCSD controller specifications for DM355 can be found at
> http://focus.ti.com/general/docs/litabsmultiplefilelist.tsp?literatureNumber=spruee2c
>
> Signed-off-by: Vipin Bhandari <vipin.bhandari@ti.com>
> Signed-off-by: Purshotam Kumar <purushotam@ti.com>
> Acked-by: David Brownell <dbrownell@users.sourceforge.net>

I don't yet see this driver upstream (at least not in linux-next.)
Do you have this queued someplace?  

There is one other DaVinci MMC update needed after this patch due to
some EDMA API changes in the DaVinci core which are queued for 2.6.32,
so if this is queued for .31 it can go as is.  If it is queued for .32,
the patch below should be folded in.
    
Thanks,

Kevin

From: "Rajashekhara, Sudhakar" <sudhakar.raj@ti.com>
Subject: [PATCH] davinci: Fix MMCSD compilation issue
To: davinci-linux-open-source@linux.davincidsp.com
Date: Wed, 24 Jun 2009 07:57:48 -0400

Passes channel controller number as the first argument to
edma_alloc_slot() API. Without this patch, kernel compilation
fails with "too few arguments to function 'edma_alloc_slot'"
error.

This patch has been tested on DM6446 EVM.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

---
 drivers/mmc/host/davinci_mmc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 170a0a0..e1095f3 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -589,7 +589,7 @@  static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host)
 	 * channel as needed to handle a scatterlist.
 	 */
 	for (i = 0; i < ARRAY_SIZE(host->links); i++) {
-		r = edma_alloc_slot(EDMA_SLOT_ANY);
+		r = edma_alloc_slot(EDMA_CTLR(host->txdma), EDMA_SLOT_ANY);
 		if (r < 0) {
 			dev_dbg(mmc_dev(host->mmc), "dma PaRAM alloc --> %d\n",
 				r);