summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRafal Prylowski <prylowski@metasoft.pl>2011-11-26 12:54:07 +0200
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-05 08:14:57 +0530
commitb62cfc5e0e59d1e0192105144b724b0c332720a0 (patch)
treeb66c73f97de0b6ad0f5331960486d59e7cfbb1ca /drivers/dma
parent02f88be9488a3d831f073c1161b1e5feacb9d3ec (diff)
downloadop-kernel-dev-b62cfc5e0e59d1e0192105144b724b0c332720a0.zip
op-kernel-dev-b62cfc5e0e59d1e0192105144b724b0c332720a0.tar.gz
dma/ep93xx_dma: fix initialization of M2M control register
Setting the flags in case of IDE didn't have any effect since the control register is overwritten few lines below. So move these to be after the control register is initialized. Signed-off-by: Rafal Prylowski <prylowski@metasoft.pl> Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ep93xx_dma.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index 009851b..526a742 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -459,10 +459,6 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)
* This IDE part is totally untested. Values below are taken
* from the EP93xx Users's Guide and might not be correct.
*/
- control |= M2M_CONTROL_NO_HDSK;
- control |= M2M_CONTROL_RSS_IDE;
- control |= M2M_CONTROL_PW_16;
-
if (data->direction == DMA_MEM_TO_DEV) {
/* Worst case from the UG */
control = (3 << M2M_CONTROL_PWSC_SHIFT);
@@ -473,6 +469,10 @@ static int m2m_hw_setup(struct ep93xx_dma_chan *edmac)
control |= M2M_CONTROL_SAH;
control |= M2M_CONTROL_TM_RX;
}
+
+ control |= M2M_CONTROL_NO_HDSK;
+ control |= M2M_CONTROL_RSS_IDE;
+ control |= M2M_CONTROL_PW_16;
break;
default:
OpenPOWER on IntegriCloud