]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: rawnand: lpx32xx: Request DMA channels using DT entries
authorPiotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
Thu, 27 Jun 2024 15:00:28 +0000 (17:00 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 17 Jul 2024 08:39:38 +0000 (10:39 +0200)
Move away from pl08x platform data towards device tree.

Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240627150046.258795-11-piotr.wojtaszczyk@timesys.com
drivers/mtd/nand/raw/lpc32xx_mlc.c
drivers/mtd/nand/raw/lpc32xx_slc.c

index 677fcb03f9bef14a9717543c221d188ea7dfedc3..92cebe871bb45515739c87313f98331768297fdd 100644 (file)
@@ -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;
+               }
        }
 
        /*
index 1c5fa855b9f2d3633df77ba113d2f205bffa218f..3b7e3d259785a83dae82ed8265a47366116b5589 100644 (file)
@@ -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;