diff options
author | Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> | 2018-07-10 22:10:15 -0400 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2018-07-11 01:17:30 -0400 |
commit | 4de1247a9826cec0ba054479124bd9aa60fb71a5 (patch) | |
tree | 3152792c67475f7084de8a52c828523ed32348a6 | |
parent | 538603c6026ce769eec633bb79349f5f287519c7 (diff) |
dmaengine: sh: rcar-dmac: add a new function to clear CHCR.DE with barrier
This patch adds a new function rcar_dmac_clear_chcr_de() to simplify
adding pause function later.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r-- | drivers/dma/sh/rcar-dmac.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 9906a9c7220b..d3b7388645bc 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c | |||
@@ -759,18 +759,25 @@ static void rcar_dmac_chcr_de_barrier(struct rcar_dmac_chan *chan) | |||
759 | dev_err(chan->chan.device->dev, "CHCR DE check error\n"); | 759 | dev_err(chan->chan.device->dev, "CHCR DE check error\n"); |
760 | } | 760 | } |
761 | 761 | ||
762 | static void rcar_dmac_sync_tcr(struct rcar_dmac_chan *chan) | 762 | static void rcar_dmac_clear_chcr_de(struct rcar_dmac_chan *chan) |
763 | { | 763 | { |
764 | u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR); | 764 | u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR); |
765 | 765 | ||
766 | if (!(chcr & RCAR_DMACHCR_DE)) | ||
767 | return; | ||
768 | |||
769 | /* set DE=0 and flush remaining data */ | 766 | /* set DE=0 and flush remaining data */ |
770 | rcar_dmac_chan_write(chan, RCAR_DMACHCR, (chcr & ~RCAR_DMACHCR_DE)); | 767 | rcar_dmac_chan_write(chan, RCAR_DMACHCR, (chcr & ~RCAR_DMACHCR_DE)); |
771 | 768 | ||
772 | /* make sure all remaining data was flushed */ | 769 | /* make sure all remaining data was flushed */ |
773 | rcar_dmac_chcr_de_barrier(chan); | 770 | rcar_dmac_chcr_de_barrier(chan); |
771 | } | ||
772 | |||
773 | static void rcar_dmac_sync_tcr(struct rcar_dmac_chan *chan) | ||
774 | { | ||
775 | u32 chcr = rcar_dmac_chan_read(chan, RCAR_DMACHCR); | ||
776 | |||
777 | if (!(chcr & RCAR_DMACHCR_DE)) | ||
778 | return; | ||
779 | |||
780 | rcar_dmac_clear_chcr_de(chan); | ||
774 | 781 | ||
775 | /* back DE if remain data exists */ | 782 | /* back DE if remain data exists */ |
776 | if (rcar_dmac_chan_read(chan, RCAR_DMATCR)) | 783 | if (rcar_dmac_chan_read(chan, RCAR_DMATCR)) |