Merge tag 'wireless-drivers-for-davem-2019-10-15' of git://git.kernel.org/pub/scm...

[linux.git] / drivers / dma / fsl-edma-common.h

diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 4e175560292ca26ab3370ae2e88e96a3ca0bcdbb..5eaa2902ed3919e370f6c77cb401b2ca21f5781f 100644 (file)
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -125,6 +125,7 @@ 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 {
@@ -139,11 +140,13 @@ 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);
 };
@@ -153,6 +156,7 @@ 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;