5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index e7d5550266e..003220a60bc 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1382,11 +1382,11 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
 
                 dsg->len = sg_dma_len(sg);
                 if (direction == DMA_MEM_TO_DEV) {
-                        dsg->src_addr = sg_phys(sg);
+                        dsg->src_addr = sg_dma_address(sg);
                         dsg->dst_addr = slave_addr;
                 } else {
                         dsg->src_addr = slave_addr;
-                        dsg->dst_addr = sg_phys(sg);
+                        dsg->dst_addr = sg_dma_address(sg);
                 }
         }
 
diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c
index 6c0e2d4c668..780e0429b38 100644
--- a/drivers/dma/coh901318_lli.c
+++ b/drivers/dma/coh901318_lli.c
@@ -270,10 +270,10 @@ coh901318_lli_fill_sg(struct coh901318_pool *pool,
 
                 if (dir == DMA_MEM_TO_DEV)
                         /* increment source address */
-                        src = sg_phys(sg);
+                        src = sg_dma_address(sg);
                 else
                         /* increment destination address */
-                        dst =  sg_phys(sg);
+                        dst = sg_dma_address(sg);
 
                 bytes_to_transfer = sg_dma_len(sg);
 
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 13b92983b24..e23dc82d43a 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -743,7 +743,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                         struct dw_desc  *desc;
                         u32             len, dlen, mem;
 
-                        mem = sg_phys(sg);
+                        mem = sg_dma_address(sg);
                         len = sg_dma_len(sg);
 
                         if (!((mem | len) & 7))
@@ -810,7 +810,7 @@ slave_sg_todev_fill_desc:
                         struct dw_desc  *desc;
                         u32             len, dlen, mem;
 
-                        mem = sg_phys(sg);
+                        mem = sg_dma_address(sg);
                         len = sg_dma_len(sg);
 
                         if (!((mem | len) & 7))
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index c900ca7aaec..d0ef5937fbf 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -398,7 +398,7 @@ static int midc_lli_fill_sg(struct intel_mid_dma_chan *midc,
                                                         desc->width,
                                                         midc->dma->block_size);
                 /*Populate SAR and DAR values*/
-                sg_phy_addr = sg_phys(sg);
+                sg_phy_addr = sg_dma_address(sg);
                 if (desc->dirn ==  DMA_MEM_TO_DEV) {
                         lli_bloc_desc->sar  = sg_phy_addr;
                         lli_bloc_desc->dar  = mids->dma_slave.dst_addr;
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 65c0495a6d4..987ab5cd261 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -621,7 +621,7 @@ static struct dma_async_tx_descriptor *pd_prep_slave_sg(struct dma_chan *chan,
                         goto err_desc_get;
 
                 desc->regs.dev_addr = reg;
-                desc->regs.mem_addr = sg_phys(sg);
+                desc->regs.mem_addr = sg_dma_address(sg);
                 desc->regs.size = sg_dma_len(sg);
                 desc->regs.next = DMA_DESC_FOLLOW_WITHOUT_IRQ;