---

yaml --- r: 332664 b: refs/heads/master c: 79f9df7 h: refs/heads/master v: v3
git-mirror · Jul 13, 2012 · d07e68d · d07e68d
1 parent 6a3d400
commit d07e68d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314a15664e028e6bcafc03495cc492645d9df4df
+refs/heads/master: 79f9df7c0027742ae7c913367b6d88dec242fa63
diff --git a/trunk/drivers/mtd/nand/lpc32xx_mlc.c b/trunk/drivers/mtd/nand/lpc32xx_mlc.c
@@ -576,25 +576,14 @@ 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;
 	dma_cap_mask_t mask;
 
 	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;