1 files changed, 40 insertions, 29 deletions

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index 680b2a00a953..44d92c34dec3 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -47,7 +47,7 @@ static void fsl_edma_enable_request(struct fsl_edma_chan *fsl_chan)
         struct edma_regs *regs = &fsl_chan->edma->regs;
         u32 ch = fsl_chan->vchan.chan.chan_id;
 
-        if (fsl_chan->edma->version == v1) {
+        if (fsl_chan->edma->drvdata->version == v1) {
                 edma_writeb(fsl_chan->edma, EDMA_SEEI_SEEI(ch), regs->seei);
                 edma_writeb(fsl_chan->edma, ch, regs->serq);
         } else {
@@ -64,7 +64,7 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
         struct edma_regs *regs = &fsl_chan->edma->regs;
         u32 ch = fsl_chan->vchan.chan.chan_id;
 
-        if (fsl_chan->edma->version == v1) {
+        if (fsl_chan->edma->drvdata->version == v1) {
                 edma_writeb(fsl_chan->edma, ch, regs->cerq);
                 edma_writeb(fsl_chan->edma, EDMA_CEEI_CEEI(ch), regs->ceei);
         } else {
@@ -77,22 +77,33 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
 }
 EXPORT_SYMBOL_GPL(fsl_edma_disable_request);
 
+static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
+                           u32 off, u32 slot, bool enable)
+{
+        u8 val8;
+
+        if (enable)
+                val8 = EDMAMUX_CHCFG_ENBL | slot;
+        else
+                val8 = EDMAMUX_CHCFG_DIS;
+
+        iowrite8(val8, addr + off);
+}
+
 void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
                         unsigned int slot, bool enable)
 {
         u32 ch = fsl_chan->vchan.chan.chan_id;
         void __iomem *muxaddr;
         unsigned int chans_per_mux, ch_off;
+        u32 dmamux_nr = fsl_chan->edma->drvdata->dmamuxs;
 
-        chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR;
+        chans_per_mux = fsl_chan->edma->n_chans / dmamux_nr;
         ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux;
         muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
         slot = EDMAMUX_CHCFG_SOURCE(slot);
 
-        if (enable)
-                iowrite8(EDMAMUX_CHCFG_ENBL | slot, muxaddr + ch_off);
-        else
-                iowrite8(EDMAMUX_CHCFG_DIS, muxaddr + ch_off);
+        mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
 }
 EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
 
@@ -647,28 +658,28 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma)
         edma->regs.erql = edma->membase + EDMA_ERQ;
         edma->regs.eeil = edma->membase + EDMA_EEI;
 
-        edma->regs.serq = edma->membase + ((edma->version == v1) ?
-                        EDMA_SERQ : EDMA64_SERQ);
-        edma->regs.cerq = edma->membase + ((edma->version == v1) ?
-                        EDMA_CERQ : EDMA64_CERQ);
-        edma->regs.seei = edma->membase + ((edma->version == v1) ?
-                        EDMA_SEEI : EDMA64_SEEI);
-        edma->regs.ceei = edma->membase + ((edma->version == v1) ?
-                        EDMA_CEEI : EDMA64_CEEI);
-        edma->regs.cint = edma->membase + ((edma->version == v1) ?
-                        EDMA_CINT : EDMA64_CINT);
-        edma->regs.cerr = edma->membase + ((edma->version == v1) ?
-                        EDMA_CERR : EDMA64_CERR);
-        edma->regs.ssrt = edma->membase + ((edma->version == v1) ?
-                        EDMA_SSRT : EDMA64_SSRT);
-        edma->regs.cdne = edma->membase + ((edma->version == v1) ?
-                        EDMA_CDNE : EDMA64_CDNE);
-        edma->regs.intl = edma->membase + ((edma->version == v1) ?
-                        EDMA_INTR : EDMA64_INTL);
-        edma->regs.errl = edma->membase + ((edma->version == v1) ?
-                        EDMA_ERR : EDMA64_ERRL);
-
-        if (edma->version == v2) {
+        edma->regs.serq = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_SERQ : EDMA_SERQ);
+        edma->regs.cerq = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_CERQ : EDMA_CERQ);
+        edma->regs.seei = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_SEEI : EDMA_SEEI);
+        edma->regs.ceei = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_CEEI : EDMA_CEEI);
+        edma->regs.cint = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_CINT : EDMA_CINT);
+        edma->regs.cerr = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_CERR : EDMA_CERR);
+        edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_SSRT : EDMA_SSRT);
+        edma->regs.cdne = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_CDNE : EDMA_CDNE);
+        edma->regs.intl = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_INTL : EDMA_INTR);
+        edma->regs.errl = edma->membase + ((edma->drvdata->version == v2) ?
+                        EDMA64_ERRL : EDMA_ERR);
+
+        if (edma->drvdata->version == v2) {
                 edma->regs.erqh = edma->membase + EDMA64_ERQH;
                 edma->regs.eeih = edma->membase + EDMA64_EEIH;
                 edma->regs.errh = edma->membase + EDMA64_ERRH;