aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-07-12 14:22:57 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-07-13 16:27:34 +0100
commit79f9df7c0027742ae7c913367b6d88dec242fa63 (patch)
treee342a4767a308a2e2d5cb88ffba2ddf3fa8ae717
parent314a15664e028e6bcafc03495cc492645d9df4df (diff)
mtd: lpc32xx_mlc: Adjust to pl08x DMA interface changes
This patch adjusts the LPC32xx MLC NAND driver to the new pl08x DMA interface, fixing the compile error resulting from changed pl08x structures. Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/lpc32xx_mlc.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 260b2c24249..1cf35932a4d 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -576,17 +576,6 @@ static void lpc32xx_ecc_enable(struct mtd_info *mtd, int mode)
/* Always enabled! */
}
-static bool lpc32xx_dma_filter(struct dma_chan *chan, void *param)
-{
- struct pl08x_dma_chan *ch =
- container_of(chan, struct pl08x_dma_chan, chan);
-
- /* In LPC32xx's PL080 DMA wiring, the MLC NAND DMA signal is #12 */
- if (ch->cd->min_signal == 12)
- return true;
- return false;
-}
-
static int lpc32xx_dma_setup(struct lpc32xx_nand_host *host)
{
struct mtd_info *mtd = &host->mtd;
@@ -594,7 +583,7 @@ static int lpc32xx_dma_setup(struct lpc32xx_nand_host *host)
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
- host->dma_chan = dma_request_channel(mask, lpc32xx_dma_filter, NULL);
+ host->dma_chan = dma_request_channel(mask, pl08x_filter_id, "nand-mlc");
if (!host->dma_chan) {
dev_err(mtd->dev.parent, "Failed to request DMA channel\n");
return -EBUSY;