dma40: move lli_load to main source file

These register writes are better placed in the main source file rather than
ll.c.

Acked-by: Per Forlin <per.forlin@stericsson.com>
Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 4e9d6c5a71343f7ece7de26d6022fe4820317f04..6a7a00d5d682a2ca84c539d90ba964989e9aaa01 100644 (file)
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -504,15 +504,29 @@ static void d40_desc_submit(struct d40_chan *d40c, struct d40_desc *desc)
        list_add_tail(&desc->node, &d40c->active);
 }
 
+static void d40_phy_lli_load(struct d40_chan *chan, struct d40_desc *desc)
+{
+       struct d40_phy_lli *lli_dst = desc->lli_phy.dst;
+       struct d40_phy_lli *lli_src = desc->lli_phy.src;
+       void __iomem *base = chan_base(chan);
+
+       writel(lli_src->reg_cfg, base + D40_CHAN_REG_SSCFG);
+       writel(lli_src->reg_elt, base + D40_CHAN_REG_SSELT);
+       writel(lli_src->reg_ptr, base + D40_CHAN_REG_SSPTR);
+       writel(lli_src->reg_lnk, base + D40_CHAN_REG_SSLNK);
+
+       writel(lli_dst->reg_cfg, base + D40_CHAN_REG_SDCFG);
+       writel(lli_dst->reg_elt, base + D40_CHAN_REG_SDELT);
+       writel(lli_dst->reg_ptr, base + D40_CHAN_REG_SDPTR);
+       writel(lli_dst->reg_lnk, base + D40_CHAN_REG_SDLNK);
+}
+
 static void d40_desc_load(struct d40_chan *d40c, struct d40_desc *d40d)
 {
        int curr_lcla = -EINVAL, next_lcla;
 
        if (chan_is_physical(d40c)) {
-               d40_phy_lli_write(d40c->base->virtbase,
-                                 d40c->phy_chan->num,
-                                 d40d->lli_phy.dst,
-                                 d40d->lli_phy.src);
+               d40_phy_lli_load(d40c, d40d);
                d40d->lli_current = d40d->lli_len;
        } else {
 

diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 552c5972c75ed06a75681174f34a5dfe12911471..fd7525162596b1310ea93f2913b758189db8c44a 100644 (file)
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -295,32 +295,6 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
 }
 
 
-void d40_phy_lli_write(void __iomem *virtbase,
-                      u32 phy_chan_num,
-                      struct d40_phy_lli *lli_dst,
-                      struct d40_phy_lli *lli_src)
-{
-
-       writel(lli_src->reg_cfg, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SSCFG);
-       writel(lli_src->reg_elt, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SSELT);
-       writel(lli_src->reg_ptr, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SSPTR);
-       writel(lli_src->reg_lnk, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SSLNK);
-
-       writel(lli_dst->reg_cfg, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SDCFG);
-       writel(lli_dst->reg_elt, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SDELT);
-       writel(lli_dst->reg_ptr, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SDPTR);
-       writel(lli_dst->reg_lnk, virtbase + D40_DREG_PCBASE +
-              phy_chan_num * D40_DREG_PCDELTA + D40_CHAN_REG_SDLNK);
-
-}
-
 /* DMA logical lli operations */
 
 static void d40_log_lli_link(struct d40_log_lli *lli_dst,

diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h
index a5d71714ebf70b0ce2943ef843474757918680a3..46578a661b2822f89ebbddc5254f0b49847f7823 100644 (file)
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
@@ -312,11 +312,6 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
                      u32 data_width2,
                      int psize);
 
-void d40_phy_lli_write(void __iomem *virtbase,
-                      u32 phy_chan_num,
-                      struct d40_phy_lli *lli_dst,
-                      struct d40_phy_lli *lli_src);
-
 /* Logical channels */
 
 struct d40_log_lli *d40_log_buf_to_lli(struct d40_log_lli *lli_sg,