[Patch v5 10/12] mtd: rawnand: lpx32xx: Request DMA channels using DT entries

[Piotr Wojtaszczyk]

Move away from pl08x platform data towards device tree.

Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszc...@timesys.com>
---
Changes for v5:
- Added fallback dma channel request for backward compatibility with DMA with
  platform data instead DT

Changes for v4:
- This patch is new in v4

 drivers/mtd/nand/raw/lpc32xx_mlc.c | 26 +++++++++++++++-----------
 drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +++++++++++++++-----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_mlc.c 
b/drivers/mtd/nand/raw/lpc32xx_mlc.c
index 677fcb03f9be..92cebe871bb4 100644
--- a/drivers/mtd/nand/raw/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c
@@ -574,18 +574,22 @@ static int lpc32xx_dma_setup(struct lpc32xx_nand_host 
*host)
        struct mtd_info *mtd = nand_to_mtd(&host->nand_chip);
        dma_cap_mask_t mask;
 
-       if (!host->pdata || !host->pdata->dma_filter) {
-               dev_err(mtd->dev.parent, "no DMA platform data\n");
-               return -ENOENT;
-       }
-
-       dma_cap_zero(mask);
-       dma_cap_set(DMA_SLAVE, mask);
-       host->dma_chan = dma_request_channel(mask, host->pdata->dma_filter,
-                                            "nand-mlc");
+       host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx");
        if (!host->dma_chan) {
-               dev_err(mtd->dev.parent, "Failed to request DMA channel\n");
-               return -EBUSY;
+               /* fallback to request using platform data */
+               if (!host->pdata || !host->pdata->dma_filter) {
+                       dev_err(mtd->dev.parent, "no DMA platform data\n");
+                       return -ENOENT;
+               }
+
+               dma_cap_zero(mask);
+               dma_cap_set(DMA_SLAVE, mask);
+               host->dma_chan = dma_request_channel(mask, 
host->pdata->dma_filter, "nand-mlc");
+
+               if (!host->dma_chan) {
+                       dev_err(mtd->dev.parent, "Failed to request DMA 
channel\n");
+                       return -EBUSY;
+               }
        }
 
        /*
diff --git a/drivers/mtd/nand/raw/lpc32xx_slc.c 
b/drivers/mtd/nand/raw/lpc32xx_slc.c
index 1c5fa855b9f2..3b7e3d259785 100644
--- a/drivers/mtd/nand/raw/lpc32xx_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_slc.c
@@ -721,18 +721,22 @@ static int lpc32xx_nand_dma_setup(struct 
lpc32xx_nand_host *host)
        struct mtd_info *mtd = nand_to_mtd(&host->nand_chip);
        dma_cap_mask_t mask;
 
-       if (!host->pdata || !host->pdata->dma_filter) {
-               dev_err(mtd->dev.parent, "no DMA platform data\n");
-               return -ENOENT;
-       }
-
-       dma_cap_zero(mask);
-       dma_cap_set(DMA_SLAVE, mask);
-       host->dma_chan = dma_request_channel(mask, host->pdata->dma_filter,
-                                            "nand-slc");
+       host->dma_chan = dma_request_chan(mtd->dev.parent, "rx-tx");
        if (!host->dma_chan) {
-               dev_err(mtd->dev.parent, "Failed to request DMA channel\n");
-               return -EBUSY;
+               /* fallback to request using platform data */
+               if (!host->pdata || !host->pdata->dma_filter) {
+                       dev_err(mtd->dev.parent, "no DMA platform data\n");
+                       return -ENOENT;
+               }
+
+               dma_cap_zero(mask);
+               dma_cap_set(DMA_SLAVE, mask);
+               host->dma_chan = dma_request_channel(mask, 
host->pdata->dma_filter, "nand-slc");
+
+               if (!host->dma_chan) {
+                       dev_err(mtd->dev.parent, "Failed to request DMA 
channel\n");
+                       return -EBUSY;
+               }
        }
 
        return 0;
-- 
2.25.1