diff options
author | Roland Stigge <stigge@antcom.de> | 2012-07-12 08:22:56 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-07-13 11:27:24 -0400 |
commit | 314a15664e028e6bcafc03495cc492645d9df4df (patch) | |
tree | aca831e3fa86029e3c919d1167b0d7e5745c5fab | |
parent | 2c99b8bfb22342ab0c06e07ee54fa0d5e638e52a (diff) |
mtd: lpc32xx_slc: Adjust to pl08x DMA interface changes
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 <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_slc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index 1719387dd008..c8c1d06b35ab 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, | |||
714 | return 0; | 714 | return 0; |
715 | } | 715 | } |
716 | 716 | ||
717 | static bool lpc32xx_dma_filter(struct dma_chan *chan, void *param) | ||
718 | { | ||
719 | struct pl08x_dma_chan *ch = | ||
720 | container_of(chan, struct pl08x_dma_chan, chan); | ||
721 | |||
722 | /* In LPC32xx's PL080 DMA wiring, the SLC NAND DMA signal is #1 */ | ||
723 | if (ch->cd->min_signal == 1) | ||
724 | return true; | ||
725 | return false; | ||
726 | } | ||
727 | |||
728 | static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host) | 717 | static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host) |
729 | { | 718 | { |
730 | struct mtd_info *mtd = &host->mtd; | 719 | struct mtd_info *mtd = &host->mtd; |
@@ -732,7 +721,7 @@ static int lpc32xx_nand_dma_setup(struct lpc32xx_nand_host *host) | |||
732 | 721 | ||
733 | dma_cap_zero(mask); | 722 | dma_cap_zero(mask); |
734 | dma_cap_set(DMA_SLAVE, mask); | 723 | dma_cap_set(DMA_SLAVE, mask); |
735 | host->dma_chan = dma_request_channel(mask, lpc32xx_dma_filter, NULL); | 724 | host->dma_chan = dma_request_channel(mask, pl08x_filter_id, "nand-slc"); |
736 | if (!host->dma_chan) { | 725 | if (!host->dma_chan) { |
737 | dev_err(mtd->dev.parent, "Failed to request DMA channel\n"); | 726 | dev_err(mtd->dev.parent, "Failed to request DMA channel\n"); |
738 | return -EBUSY; | 727 | return -EBUSY; |