s3cmci: fix s3c2410_dma_config() arguments.
From: Ben Dooks <[email protected]>
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.
drivers/mmc/host/s3cmci.c +1 -2
@@ -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 );
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes'
Quoted 15 lines · On Tue, 10 Mar 2009 23:57:11 +0000 Ben Dooks <[email protected]> wrote:
From: Ben Dooks <[email protected]>
The s3cmci driver is calling
s3c2410_dma_configwith incorrect data for the DCON register. TheS3C2410_DCON_HWTRIGis implicit in the channel configuration and the device selection ofS3C2410_DCON_CH0_SDIis incorrect as the DMA system may not select channel 0.Signed-off-by Ben Dooks <[email protected]>Index:
linux.git/drivers/mmc/host/s3cmci.c
===================================================================
drivers/mmc/host/s3cmci.c static void s3cmci_dma_setup(struct s3cm · line 799
Quoted 9 lines
drivers/mmc/host/s3cmci.c +1
-2@@ -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.
Pierre Ossman
Acked-byQuoted 6 lines · On Wed, 11 Mar 2009 13:39:46 -0700 Andrew Morton <[email protected]>…
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.
Sorry, it got lost in the noise. That patch isn't critical. It has been working fine so far, so the only problem seems to be a bit of waster energy.
Quoted 1 line
I'll scoot both these into Linus tomorrowish unless told otherwise.
Feel free to push this patch though. :)
Rgds
Signature · 9 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org rdesktop, core developer http://www.rdesktop.org WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.