|
@@ -927,22 +927,26 @@ static int dwc_config(struct dma_chan *chan, struct dma_slave_config *sconfig)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int dwc_pause(struct dma_chan *chan)
|
|
|
|
|
|
+static void dwc_chan_pause(struct dw_dma_chan *dwc)
|
|
{
|
|
{
|
|
- struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
|
|
|
|
- unsigned long flags;
|
|
|
|
unsigned int count = 20; /* timeout iterations */
|
|
unsigned int count = 20; /* timeout iterations */
|
|
u32 cfglo;
|
|
u32 cfglo;
|
|
|
|
|
|
- spin_lock_irqsave(&dwc->lock, flags);
|
|
|
|
-
|
|
|
|
cfglo = channel_readl(dwc, CFG_LO);
|
|
cfglo = channel_readl(dwc, CFG_LO);
|
|
channel_writel(dwc, CFG_LO, cfglo | DWC_CFGL_CH_SUSP);
|
|
channel_writel(dwc, CFG_LO, cfglo | DWC_CFGL_CH_SUSP);
|
|
while (!(channel_readl(dwc, CFG_LO) & DWC_CFGL_FIFO_EMPTY) && count--)
|
|
while (!(channel_readl(dwc, CFG_LO) & DWC_CFGL_FIFO_EMPTY) && count--)
|
|
udelay(2);
|
|
udelay(2);
|
|
|
|
|
|
set_bit(DW_DMA_IS_PAUSED, &dwc->flags);
|
|
set_bit(DW_DMA_IS_PAUSED, &dwc->flags);
|
|
|
|
+}
|
|
|
|
|
|
|
|
+static int dwc_pause(struct dma_chan *chan)
|
|
|
|
+{
|
|
|
|
+ struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
|
|
|
|
+ unsigned long flags;
|
|
|
|
+
|
|
|
|
+ spin_lock_irqsave(&dwc->lock, flags);
|
|
|
|
+ dwc_chan_pause(dwc);
|
|
spin_unlock_irqrestore(&dwc->lock, flags);
|
|
spin_unlock_irqrestore(&dwc->lock, flags);
|
|
|
|
|
|
return 0;
|
|
return 0;
|