From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Fri, 23 Feb 2007 18:58:48 +0000 (+0100)
Subject: [MIPS] Fix dma_sync_*_for_device() functions
X-Git-Tag: firefly_0821_release~30964
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b43fb6bc118226206c17be5f46297fd76b4abbb;p=firefly-linux-kernel-4.4.55.git

[MIPS] Fix dma_sync_*_for_device() functions

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 4a32e939698f..a72093ad105f 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -246,10 +246,10 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
 {
 	BUG_ON(direction == DMA_NONE);
 
-	if (cpu_is_noncoherent_r10000(dev)) {
+	if (!plat_device_is_coherent(dev)) {
 		unsigned long addr;
 
-		addr = plat_dma_addr_to_phys(dma_handle);
+		addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);
 		__dma_sync(addr, size, direction);
 	}
 }
@@ -276,7 +276,7 @@ void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
 {
 	BUG_ON(direction == DMA_NONE);
 
-	if (cpu_is_noncoherent_r10000(dev)) {
+	if (!plat_device_is_coherent(dev)) {
 		unsigned long addr;
 
 		addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle);