aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ste_dma40_ll.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-01-25 05:18:13 -0500
committerDan Williams <dan.j.williams@intel.com>2011-01-31 01:27:17 -0500
commit7fe8be5a74eb058b0b48970caef83e0215f55944 (patch)
treeadfd90a8aa8b1abb5adfc0a3ccf27255c07e1020 /drivers/dma/ste_dma40_ll.c
parent594ece4dc0e8ac222945ef2048430600ad3c7644 (diff)
dma40: use sg_dma_address() instead of sg_phys()
The address to use for DMA should be taken from sg_dma_address() and not sg_phys(). Acked-by: Per Forlin <per.forlin@stericsson.com> Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ste_dma40_ll.c')
-rw-r--r--drivers/dma/ste_dma40_ll.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 0b096a38322d..6f03f580c492 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -272,7 +272,7 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
272 if (target) 272 if (target)
273 dst = target; 273 dst = target;
274 else 274 else
275 dst = sg_phys(current_sg); 275 dst = sg_dma_address(current_sg);
276 276
277 l_phys = ALIGN(lli_phys + (lli - lli_sg) * 277 l_phys = ALIGN(lli_phys + (lli - lli_sg) *
278 sizeof(struct d40_phy_lli), D40_LLI_ALIGN); 278 sizeof(struct d40_phy_lli), D40_LLI_ALIGN);
@@ -416,7 +416,7 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
416 if (direction == DMA_TO_DEVICE) { 416 if (direction == DMA_TO_DEVICE) {
417 lli_src = 417 lli_src =
418 d40_log_buf_to_lli(lli_src, 418 d40_log_buf_to_lli(lli_src,
419 sg_phys(current_sg), 419 sg_dma_address(current_sg),
420 sg_dma_len(current_sg), 420 sg_dma_len(current_sg),
421 lcsp->lcsp1, src_data_width, 421 lcsp->lcsp1, src_data_width,
422 dst_data_width, 422 dst_data_width,
@@ -431,7 +431,7 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
431 } else { 431 } else {
432 lli_dst = 432 lli_dst =
433 d40_log_buf_to_lli(lli_dst, 433 d40_log_buf_to_lli(lli_dst,
434 sg_phys(current_sg), 434 sg_dma_address(current_sg),
435 sg_dma_len(current_sg), 435 sg_dma_len(current_sg),
436 lcsp->lcsp3, dst_data_width, 436 lcsp->lcsp3, dst_data_width,
437 src_data_width, 437 src_data_width,
@@ -491,7 +491,7 @@ int d40_log_sg_to_lli(struct scatterlist *sg,
491 for_each_sg(sg, current_sg, sg_len, i) { 491 for_each_sg(sg, current_sg, sg_len, i) {
492 total_size += sg_dma_len(current_sg); 492 total_size += sg_dma_len(current_sg);
493 lli = d40_log_buf_to_lli(lli, 493 lli = d40_log_buf_to_lli(lli,
494 sg_phys(current_sg), 494 sg_dma_address(current_sg),
495 sg_dma_len(current_sg), 495 sg_dma_len(current_sg),
496 lcsp13, 496 lcsp13,
497 data_width1, data_width2, true); 497 data_width1, data_width2, true);