diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:23:15 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 17:23:21 +0100 |
| commit | a173fc693b25216c5c834978f4fafd731fd4ff94 (patch) | |
| tree | f75c2fa106217cc3afd1bde6803ca77fe953bbcf /drivers/dma/imx-sdma.c | |
| parent | Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 i... (diff) | |
| parent | ARM: kirkwood: convert uart0 to devicetree. (diff) | |
| download | linux-a173fc693b25216c5c834978f4fafd731fd4ff94.tar.xz linux-a173fc693b25216c5c834978f4fafd731fd4ff94.zip | |
Merge branch 'kirkwood/board' into next/boards
* kirkwood/board: (2 commits)
ARM: kirkwood: convert uart0 to devicetree.
ARM: kirkwood: add dreamplug (fdt) support.
Series sent by email from Jason Cooper <jason@lakedaemon.net>
Update to Linux 3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/dma/imx-sdma.c')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index a8af379680c1..8bc5acf36ee5 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1102,11 +1102,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, case DMA_SLAVE_CONFIG: if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) { sdmac->per_address = dmaengine_cfg->src_addr; - sdmac->watermark_level = dmaengine_cfg->src_maxburst; + sdmac->watermark_level = dmaengine_cfg->src_maxburst * + dmaengine_cfg->src_addr_width; sdmac->word_size = dmaengine_cfg->src_addr_width; } else { sdmac->per_address = dmaengine_cfg->dst_addr; - sdmac->watermark_level = dmaengine_cfg->dst_maxburst; + sdmac->watermark_level = dmaengine_cfg->dst_maxburst * + dmaengine_cfg->dst_addr_width; sdmac->word_size = dmaengine_cfg->dst_addr_width; } sdmac->direction = dmaengine_cfg->direction; |