dmaengine: Revert "dmaengine: fsl-edma: add i.mx7ulp edma2 version support"

This reverts commit 7144afd025b2 ("dmaengine: fsl-edma: add i.mx7ulp
edma2 version support") as this fails to build with module option due to
usage of of_irq_count() which is not an exported symbol as kernel
drivers are *not* expected to use it (rightly so).

Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index 6d6d8a4e8e389a9688f3f7a052330a9b90c4e534..44d92c34dec31d4850566ca8d1809e623164e785 100644 (file)
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -90,19 +90,6 @@ static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
        iowrite8(val8, addr + off);
 }
 
-void mux_configure32(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
-                    u32 off, u32 slot, bool enable)
-{
-       u32 val;
-
-       if (enable)
-               val = EDMAMUX_CHCFG_ENBL << 24 | slot;
-       else
-               val = EDMAMUX_CHCFG_DIS;
-
-       iowrite32(val, addr + off * 4);
-}
-
 void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
                        unsigned int slot, bool enable)
 {
@@ -116,10 +103,7 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
        muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
        slot = EDMAMUX_CHCFG_SOURCE(slot);
 
-       if (fsl_chan->edma->drvdata->version == v3)
-               mux_configure32(fsl_chan, muxaddr, ch_off, slot, enable);
-       else
-               mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
+       mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
 }
 EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
 

diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 5eaa2902ed3919e370f6c77cb401b2ca21f5781f..4e175560292ca26ab3370ae2e88e96a3ca0bcdbb 100644 (file)
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -125,7 +125,6 @@ struct fsl_edma_chan {
        dma_addr_t                      dma_dev_addr;
        u32                             dma_dev_size;
        enum dma_data_direction         dma_dir;
-       char                            chan_name[16];
 };
 
 struct fsl_edma_desc {
@@ -140,13 +139,11 @@ struct fsl_edma_desc {
 enum edma_version {
        v1, /* 32ch, Vybrid, mpc57x, etc */
        v2, /* 64ch Coldfire */
-       v3, /* 32ch, i.mx7ulp */
 };
 
 struct fsl_edma_drvdata {
        enum edma_version       version;
        u32                     dmamuxs;
-       bool                    has_dmaclk;
        int                     (*setup_irq)(struct platform_device *pdev,
                                             struct fsl_edma_engine *fsl_edma);
 };
@@ -156,7 +153,6 @@ struct fsl_edma_engine {
        void __iomem            *membase;
        void __iomem            *muxbase[DMAMUX_NR];
        struct clk              *muxclk[DMAMUX_NR];
-       struct clk              *dmaclk;
        struct mutex            fsl_edma_mutex;
        const struct fsl_edma_drvdata *drvdata;
        u32                     n_chans;

diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index 50fe196b0c73e0756c7abda06d74f3db3fbccfe6..e616425acd5f5d13bc56defcd1f28aa2dac2c7ab 100644 (file)
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -166,50 +166,6 @@ fsl_edma_irq_init(struct platform_device *pdev, struct fsl_edma_engine *fsl_edma
        return 0;
 }
 
-static int
-fsl_edma2_irq_init(struct platform_device *pdev,
-                  struct fsl_edma_engine *fsl_edma)
-{
-       struct device_node *np = pdev->dev.of_node;
-       int i, ret, irq;
-       int count;
-
-       count = of_irq_count(np);
-       dev_dbg(&pdev->dev, "%s Found %d interrupts\r\n", __func__, count);
-       if (count <= 2) {
-               dev_err(&pdev->dev, "Interrupts in DTS not correct.\n");
-               return -EINVAL;
-       }
-       /*
-        * 16 channel independent interrupts + 1 error interrupt on i.mx7ulp.
-        * 2 channel share one interrupt, for example, ch0/ch16, ch1/ch17...
-        * For now, just simply request irq without IRQF_SHARED flag, since 16
-        * channels are enough on i.mx7ulp whose M4 domain own some peripherals.
-        */
-       for (i = 0; i < count; i++) {
-               irq = platform_get_irq(pdev, i);
-               if (irq < 0)
-                       return -ENXIO;
-
-               sprintf(fsl_edma->chans[i].chan_name, "eDMA2-CH%02d", i);
-
-               /* The last IRQ is for eDMA err */
-               if (i == count - 1)
-                       ret = devm_request_irq(&pdev->dev, irq,
-                                               fsl_edma_err_handler,
-                                               0, "eDMA2-ERR", fsl_edma);
-               else
-                       ret = devm_request_irq(&pdev->dev, irq,
-                                               fsl_edma_tx_handler, 0,
-                                               fsl_edma->chans[i].chan_name,
-                                               fsl_edma);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
 static void fsl_edma_irq_exit(
                struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
 {
@@ -235,16 +191,8 @@ static struct fsl_edma_drvdata vf610_data = {
        .setup_irq = fsl_edma_irq_init,
 };
 
-static struct fsl_edma_drvdata imx7ulp_data = {
-       .version = v3,
-       .dmamuxs = 1,
-       .has_dmaclk = true,
-       .setup_irq = fsl_edma2_irq_init,
-};
-
 static const struct of_device_id fsl_edma_dt_ids[] = {
        { .compatible = "fsl,vf610-edma", .data = &vf610_data},
-       { .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, fsl_edma_dt_ids);
@@ -292,20 +240,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
        fsl_edma_setup_regs(fsl_edma);
        regs = &fsl_edma->regs;
 
-       if (drvdata->has_dmaclk) {
-               fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma");
-               if (IS_ERR(fsl_edma->dmaclk)) {
-                       dev_err(&pdev->dev, "Missing DMA block clock.\n");
-                       return PTR_ERR(fsl_edma->dmaclk);
-               }
-
-               ret = clk_prepare_enable(fsl_edma->dmaclk);
-               if (ret) {
-                       dev_err(&pdev->dev, "DMA clk block failed.\n");
-                       return ret;
-               }
-       }
-
        for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) {
                char clkname[32];