summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2012-09-03 13:46:19 +0300
committerVinod Koul <vinod.koul@linux.intel.com>2012-09-14 08:29:46 +0530
commit8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b (patch)
tree2b3e2169e830b6b1d02cf361323e22b72ad123a5
parentf1a7757008b810217b2380d01b740244f21c09bd (diff)
downloadlinux-3.10-8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b.tar.gz
linux-3.10-8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b.tar.bz2
linux-3.10-8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b.zip
dw_dmac: utilize slave_id to pass request line
There is slave_id field in the generic slave config structure that is dedicated for the uniq slave number. In our case we have the request lines wired to the certain hardware. Therefore the number of the request line is uniq and could be used as slave_id. It allows us in some cases to drop out the usage of the custom slave config structure. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--drivers/dma/dw_dmac.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 4f4ff1337ca..efbd16a296f 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -177,6 +177,11 @@ static void dwc_initialize(struct dw_dma_chan *dwc)
cfghi = dws->cfg_hi;
cfglo |= dws->cfg_lo & ~DWC_CFGL_CH_PRIOR_MASK;
+ } else {
+ if (dwc->dma_sconfig.direction == DMA_MEM_TO_DEV)
+ cfghi = DWC_CFGH_DST_PER(dwc->dma_sconfig.slave_id);
+ else if (dwc->dma_sconfig.direction == DMA_DEV_TO_MEM)
+ cfghi = DWC_CFGH_SRC_PER(dwc->dma_sconfig.slave_id);
}
channel_writel(dwc, CFG_LO, cfglo);