Commit bba10cd3 authored by Russell King's avatar Russell King

[ARM] s3c2410: DMA uses __iomem pointers.

parent 19f77539
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <asm/arch/map.h> #include <asm/arch/map.h>
/* io map for dma */ /* io map for dma */
static void *dma_base; static void __iomem *dma_base;
/* dma channel state information */ /* dma channel state information */
s3c2410_dma_chan_t s3c2410_chans[S3C2410_DMA_CHANNELS]; s3c2410_dma_chan_t s3c2410_chans[S3C2410_DMA_CHANNELS];
...@@ -1065,7 +1065,7 @@ static int __init s3c2410_init_dma(void) ...@@ -1065,7 +1065,7 @@ static int __init s3c2410_init_dma(void)
/* dma channel irqs are in order.. */ /* dma channel irqs are in order.. */
cp->number = channel; cp->number = channel;
cp->irq = channel + IRQ_DMA0; cp->irq = channel + IRQ_DMA0;
cp->regs = (unsigned long)dma_base + (channel*0x40); cp->regs = dma_base + (channel*0x40);
/* point current stats somewhere */ /* point current stats somewhere */
cp->stats = &cp->stats_store; cp->stats = &cp->stats_store;
...@@ -1075,7 +1075,7 @@ static int __init s3c2410_init_dma(void) ...@@ -1075,7 +1075,7 @@ static int __init s3c2410_init_dma(void)
cp->load_timeout = 1<<18; cp->load_timeout = 1<<18;
printk("DMA channel %d at %08lx, irq %d\n", printk("DMA channel %d at %p, irq %d\n",
cp->number, cp->regs, cp->irq); cp->number, cp->regs, cp->irq);
} }
......
...@@ -198,7 +198,7 @@ struct s3c2410_dma_chan_s { ...@@ -198,7 +198,7 @@ struct s3c2410_dma_chan_s {
unsigned int flags; /* channel flags */ unsigned int flags; /* channel flags */
/* channel's hardware position and configuration */ /* channel's hardware position and configuration */
unsigned long regs; /* channels registers */ void __iomem *regs; /* channels registers */
unsigned int irq; /* channel irq */ unsigned int irq; /* channel irq */
unsigned long addr_reg; /* data address register */ unsigned long addr_reg; /* data address register */
unsigned long dcon; /* default value of DCON */ unsigned long dcon; /* default value of DCON */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment