This patch adjusts the LPC32xx SLC NAND driver to the new pl08x DMA interface,
fixing the compile error resulting from changed pl08x structures.
Signed-off-by: Roland Stigge <sti...@antcom.de>
---
Applies to today's linux-next (integrated lpc32xx-next and dma branches which
collide)
drivers/mtd/nand/lpc32xx_slc.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 1719387..c8c1d06 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -714,17 +714,6 @@ static int lpc32xx_nand_write_page_raw_syndrome(struct
mtd_info *mtd,
return 0;
}
-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 SLC NAND DMA signal is #1 */
- if (ch->cd->min_signal == 1)
- return true;
- return false;
-}
-
static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host)
{
struct mtd_info *mtd = &host->mtd;
@@ -732,7 +721,7 @@ static int lpc32xx_nand_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-slc");
if (!host->dma_chan) {
dev_err(mtd->dev.parent, "Failed to request DMA channel\n");
return -EBUSY;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
