Re: s3cmci: fix s3c2410_dma_config() arguments.

From: Andrew Morton
Date: Wed Mar 11 2009 - 16:41:58 EST


On Tue, 10 Mar 2009 23:57:11 +0000
Ben Dooks <ben@xxxxxxxxxxxx> wrote:

> From: Ben Dooks <ben@xxxxxxxxxxxx>
>
> The s3cmci driver is calling s3c2410_dma_config with incorrect data
> for the DCON register. The S3C2410_DCON_HWTRIG is implicit in the
> channel configuration and the device selection of S3C2410_DCON_CH0_SDI
> is incorrect as the DMA system may not select channel 0.
>
> Signed-off-by: Ben Dooks <ben@xxxxxxxxxxxx>
>
> Index: linux.git/drivers/mmc/host/s3cmci.c
> ===================================================================
> --- linux.git.orig/drivers/mmc/host/s3cmci.c 2009-01-20 09:07:50.000000000 +0000
> +++ linux.git/drivers/mmc/host/s3cmci.c 2009-01-20 09:08:11.000000000 +0000
> @@ -793,8 +793,7 @@ static void s3cmci_dma_setup(struct s3cm
> host->mem->start + host->sdidata);
>
> if (!setup_ok) {
> - s3c2410_dma_config(host->dma, 4,
> - (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
> + s3c2410_dma_config(host->dma, 4, 0);
> s3c2410_dma_set_buffdone_fn(host->dma,
> s3cmci_dma_done_callback);
> s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);
>

This looks like 2.6.29 material?

mmc-in-mmc_power_up-use-previously-selected-ocr-if-available.patch also
looks like 2.6.29 material to me, but Pierre isn't answering the phone.

I'll scoot both these into Linus tomorrowish unless told otherwise.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/