Commit 308d333a authored by Russell King's avatar Russell King Committed by Russell King

[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code

There's no point these being in a generic include file when they're
only used in arch/arm/mach-rpc/dma.c.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f0ffc816
...@@ -43,19 +43,6 @@ struct dma_struct { ...@@ -43,19 +43,6 @@ struct dma_struct {
const struct dma_ops *d_ops; const struct dma_ops *d_ops;
}; };
struct floppy_dma {
struct dma_struct dma;
unsigned int fiq;
};
struct iomd_dma {
struct dma_struct dma;
unsigned int state;
unsigned long base; /* Controller base address */
int irq; /* Controller IRQ */
struct scatterlist cur_sg; /* Current controller buffer */
};
/* /*
* isa_dma_add - add an ISA-style DMA channel * isa_dma_add - add an ISA-style DMA channel
*/ */
......
...@@ -26,6 +26,14 @@ ...@@ -26,6 +26,14 @@
#include <asm/mach/dma.h> #include <asm/mach/dma.h>
#include <asm/hardware/iomd.h> #include <asm/hardware/iomd.h>
struct iomd_dma {
struct dma_struct dma;
unsigned int state;
unsigned long base; /* Controller base address */
int irq; /* Controller IRQ */
struct scatterlist cur_sg; /* Current controller buffer */
};
#if 0 #if 0
typedef enum { typedef enum {
dma_size_8 = 1, dma_size_8 = 1,
...@@ -242,6 +250,11 @@ static struct fiq_handler fh = { ...@@ -242,6 +250,11 @@ static struct fiq_handler fh = {
.name = "floppydma" .name = "floppydma"
}; };
struct floppy_dma {
struct dma_struct dma;
unsigned int fiq;
};
static void floppy_enable_dma(unsigned int chan, dma_t *dma) static void floppy_enable_dma(unsigned int chan, dma_t *dma)
{ {
struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma); struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma);
......
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