patch-2.4.22 linux-2.4.22/include/asm-mips/au1000_dma.h

• Lines: 27
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips/au1000_dma.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.21/include/asm-mips/au1000_dma.h linux-2.4.22/include/asm-mips/au1000_dma.h
@@ -31,6 +31,7 @@
 #ifndef __ASM_AU1000_DMA_H
 #define __ASM_AU1000_DMA_H
 
+#include <linux/config.h>
 #include <asm/io.h>		/* need byte IO */
 #include <linux/spinlock.h>	/* And spinlocks */
 #include <linux/delay.h>
@@ -228,7 +229,7 @@
 	disable_dma(dmanr);
 
 	// set device FIFO address
-	au_writel(virt_to_phys((void *) chan->fifo_addr),
+	au_writel(PHYSADDR(chan->fifo_addr),
 		  chan->io + DMA_PERIPHERAL_ADDR);
 
 	mode = chan->mode | (chan->dev_id << DMA_DID_BIT);
@@ -289,8 +290,7 @@
 	if (chan->dev_id != DMA_ID_GP04 && chan->dev_id != DMA_ID_GP05)
 		return;
 
-	au_writel(virt_to_phys((void *) a),
-		  chan->io + DMA_PERIPHERAL_ADDR);
+	au_writel(PHYSADDR(a), chan->io + DMA_PERIPHERAL_ADDR);
 }
 
 /*