|
@@ -1,6 +1,5 @@
|
|
|
/*
|
|
|
- * Driver for the Synopsys DesignWare DMA Controller (aka DMACA on
|
|
|
- * AVR32 systems.)
|
|
|
+ * Core driver for the Synopsys DesignWare DMA Controller
|
|
|
*
|
|
|
* Copyright (C) 2007-2008 Atmel Corporation
|
|
|
* Copyright (C) 2010-2011 ST Microelectronics
|
|
@@ -9,6 +8,7 @@
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
* published by the Free Software Foundation.
|
|
|
*/
|
|
|
+
|
|
|
#include <linux/bitops.h>
|
|
|
#include <linux/clk.h>
|
|
|
#include <linux/delay.h>
|
|
@@ -222,7 +222,6 @@ static inline void dwc_dump_chan_regs(struct dw_dma_chan *dwc)
|
|
|
channel_readl(dwc, CTL_LO));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static inline void dwc_chan_disable(struct dw_dma *dw, struct dw_dma_chan *dwc)
|
|
|
{
|
|
|
channel_clear_bit(dw, CH_EN, dwc->mask);
|
|
@@ -1813,6 +1812,7 @@ static int dw_resume_noirq(struct device *dev)
|
|
|
|
|
|
clk_prepare_enable(dw->clk);
|
|
|
dma_writel(dw, CFG, DW_CFG_DMA_EN);
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|