fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-arm / arch-pxa / dma.h

diff --git a/include/asm-arm/arch-pxa/dma.h b/include/asm-arm/arch-pxa/dma.h
index edc4804..bed042d 100644 (file)
--- a/include/asm-arm/arch-pxa/dma.h
+++ b/include/asm-arm/arch-pxa/dma.h
@@ -12,36 +12,51 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS                0xffffffff
-
-/* No DMA as the rest of the world see it */
-#define MAX_DMA_CHANNELS       0
-
 /*
  * Descriptor structure for PXA's DMA engine
  * Note: this structure must always be aligned to a 16-byte boundary.
  */
 
-typedef struct {
+typedef struct pxa_dma_desc {
        volatile u32 ddadr;     /* Points to the next descriptor + flags */
        volatile u32 dsadr;     /* DSADR value for the current transfer */
        volatile u32 dtadr;     /* DTADR value for the current transfer */
        volatile u32 dcmd;      /* DCMD value for the current transfer */
 } pxa_dma_desc;
 
-/*
- * DMA registration
- */
-
 typedef enum {
        DMA_PRIO_HIGH = 0,
-       DMA_PRIO_MEDIUM = 4,
-       DMA_PRIO_LOW = 8
+       DMA_PRIO_MEDIUM = 1,
+       DMA_PRIO_LOW = 2
 } pxa_dma_prio;
 
+#if defined(CONFIG_PXA27x)
+
+#define PXA_DMA_CHANNELS       32
+
+#define pxa_for_each_dma_prio(ch, prio)                                        \
+for (                                                                  \
+       ch = prio * 4;                                                  \
+       ch != (4 << prio) + 16;                                         \
+       ch = (ch + 1 == (4 << prio)) ? (prio * 4 + 16) : (ch + 1)       \
+)
+
+#elif defined(CONFIG_PXA25x)
+
+#define PXA_DMA_CHANNELS       16
+
+#define pxa_for_each_dma_prio(ch, prio)                                        \
+       for (ch = prio * 4; ch != (4 << prio); ch++)
+
+#endif
+
+/*
+ * DMA registration
+ */
+
 int pxa_request_dma (char *name,
                         pxa_dma_prio prio,
-                        void (*irq_handler)(int, void *, struct pt_regs *),
+                        void (*irq_handler)(int, void *),
                         void *data);
 
 void pxa_free_dma (int dma_ch);