Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / asm-blackfin / mach-bf548 / dma.h

diff --git a/include/asm-blackfin/mach-bf548/dma.h b/include/asm-blackfin/mach-bf548/dma.h
index 5a334c813c7945e8c73470bf5add75f81e663079..46ff31f20ae5b821d7205b1b20a1e910f6854483 100644 (file)
--- a/include/asm-blackfin/mach-bf548/dma.h
+++ b/include/asm-blackfin/mach-bf548/dma.h
@@ -44,7 +44,6 @@
 #define CH_UART1_TX            9
 #define CH_ATAPI_RX            10
 #define CH_ATAPI_TX            11
-
 #define CH_EPPI0               12
 #define CH_EPPI1               13
 #define CH_EPPI2               14
@@ -52,12 +51,28 @@
 #define CH_PIXC_OVERLAY                16
 #define CH_PIXC_OUTPUT         17
 #define CH_SPORT2_RX           18
+#define CH_UART2_RX            18
 #define CH_SPORT2_TX           19
+#define CH_UART2_TX            19
 #define CH_SPORT3_RX           20
+#define CH_UART3_RX            20
 #define CH_SPORT3_TX           21
+#define CH_UART3_TX            21
 #define CH_SDH                 22
+#define CH_NFC                 22
 #define CH_SPI2                        23
 
-#define MAX_BLACKFIN_DMA_CHANNEL CH_SPI2
+#define CH_MEM_STREAM0_DEST    24
+#define CH_MEM_STREAM0_SRC     25
+#define CH_MEM_STREAM1_DEST    26
+#define CH_MEM_STREAM1_SRC     27
+#define CH_MEM_STREAM2_DEST    28
+#define CH_MEM_STREAM2_SRC     29
+#define CH_MEM_STREAM3_DEST    30
+#define CH_MEM_STREAM3_SRC     31
+
+#define MAX_BLACKFIN_DMA_CHANNEL 32
 
+extern int channel2irq(unsigned int channel);
+extern struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL];
 #endif