From d010f32a3cb41ddb7e04d33f5bd17ff1322b1065 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 3 Sep 2012 13:46:19 +0300 Subject: [PATCH] --- yaml --- r: 332870 b: refs/heads/master c: 8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5ca7de7071c3..5bae6155f4b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a7757008b810217b2380d01b740244f21c09bd +refs/heads/master: 8fccc5bfd7f83fd321db42bcad36e2d9fe13d65b diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index 4f4ff1337cac..efbd16a296f1 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/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);