Skip to content

Commit

Permalink
dma: sh_dma: not all SH DMAC implementations support MEMCPY
Browse files Browse the repository at this point in the history 
Add a flag to allow platforms to specify, whether a DMAC instance supports
the MEMCPY operation. To avoid regressions, preserve the current default.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Guennadi Liakhovetski authored and Vinod Koul committed Feb 1, 2012
1 parent a5044cd commit e9c8d7a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/dma/shdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)

INIT_LIST_HEAD(&shdev->common.channels);

dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
if (!pdata->slave_only)
dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
if (pdata->slave && pdata->slave_num)
dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);

Expand Down
1 change: 1 addition & 0 deletions include/linux/sh_dma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ struct sh_dmae_pdata {
unsigned int needs_tend_set:1;
unsigned int no_dmars:1;
unsigned int chclr_present:1;
unsigned int slave_only:1;
};

/* DMA register */
Expand Down

0 comments on commit e9c8d7a

Please sign in to comment.