[ARM] Remove '__address' from scatterlist and convert to DMA API

The old __address element in struct scatterlist remained from older
kernels because the ARM DMA emulation code made use of it.  Move
this field into struct dma_struct, and convert DMA emulation code
to setup a SG entry as required.

Also, convert DMA emulation code to use the new DMA API rather
than the PCI DMA API.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/asm-arm/mach/dma.h b/include/asm-arm/mach/dma.h
index 31bf716106ee..e7c4a20aad53 100644
--- a/include/asm-arm/mach/dma.h
+++ b/include/asm-arm/mach/dma.h
@@ -25,13 +25,15 @@ struct dma_ops {
 };
 
 struct dma_struct {
+        void            *addr;          /* single DMA address           */
+        unsigned long   count;          /* single DMA size              */
         struct scatterlist buf;         /* single DMA                   */
         int             sgcount;        /* number of DMA SG             */
         struct scatterlist *sg;         /* DMA Scatter-Gather List      */
 
         unsigned int    active:1;       /* Transfer active              */
         unsigned int    invalid:1;      /* Address/Count changed        */
-        unsigned int    using_sg:1;     /* using scatter list?          */
+
         dmamode_t       dma_mode;       /* DMA mode                     */
         int             speed;          /* DMA speed                    */