Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4b0927 authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

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: default avatarPer Forlin <per.forlin@stericsson.com>
Acked-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent cade1d30

drivers/dma/ste_dma40.c

+18 −4
Original line number Diff line number Diff line
@@ -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 {

drivers/dma/ste_dma40_ll.c

+0 −26
Original line number Diff line number Diff line
@@ -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,

drivers/dma/ste_dma40_ll.h

+0 −5
Original line number Diff line number Diff line
@@ -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,