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

Commit 470b23f7 authored by Russell King's avatar Russell King
Browse files

dmaengine: omap-dma: consolidate clearing channel status register 



Consolidate clearing of the channel status register, rather than open
coding the same functionality in two places.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 49ae0b29

drivers/dma/omap-dma.c

+10 −10
Original line number Diff line number Diff line
@@ -169,6 +169,14 @@ static void omap_dma_desc_free(struct virt_dma_desc *vd) 
	kfree(container_of(vd, struct omap_desc, vd));

}



static void omap_dma_clear_csr(struct omap_chan *c)

{

	if (dma_omap1())

		c->plat->dma_read(CSR, c->dma_ch);

	else

		c->plat->dma_write(~0, CSR, c->dma_ch);

}



static void omap_dma_start(struct omap_chan *c, struct omap_desc *d)

{

	struct omap_dmadev *od = to_omap_dma_dev(c->vc.chan.device);
@@ -191,11 +199,7 @@ static void omap_dma_start(struct omap_chan *c, struct omap_desc *d) 
	} else if (od->plat->errata & DMA_ERRATA_PARALLEL_CHANNELS)

		c->plat->dma_write(c->dma_ch, CLNK_CTRL, c->dma_ch);



	/* Clear CSR */

	if (dma_omap1())

		c->plat->dma_read(CSR, c->dma_ch);

	else

		c->plat->dma_write(~0, CSR, c->dma_ch);

	omap_dma_clear_csr(c);



	/* Enable interrupts */

	c->plat->dma_write(d->cicr, CICR, c->dma_ch);
@@ -214,11 +218,7 @@ static void omap_dma_stop(struct omap_chan *c) 
	/* disable irq */

	c->plat->dma_write(0, CICR, c->dma_ch);



	/* Clear CSR */

	if (dma_omap1())

		c->plat->dma_read(CSR, c->dma_ch);

	else

		c->plat->dma_write(~0, CSR, c->dma_ch);

	omap_dma_clear_csr(c);



	val = c->plat->dma_read(CCR, c->dma_ch);

	if (od->plat->errata & DMA_ERRATA_i541 && val & CCR_TRIGGER_SRC) {