Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index b4c3465565b42e06ad296c9ab3738b5f773c1ff0..be0431efc3ea06e6e25608fdb2fbbcaccc94b4f8 100644 (file)
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -359,14 +359,14 @@
 #define DMA_DEFAULT_FIFO_DEPTH         0x10
 #define DMA_DEFAULT_ARB_RATE           0x01
 /* Pass THREAD_RESERVE ORed with THREAD_FIFO for tparams */
-#define DMA_THREAD_RESERVE_NORM   (0x00 << 12) /* Def */
-#define DMA_THREAD_RESERVE_ONET   (0x01 << 12)
-#define DMA_THREAD_RESERVE_TWOT   (0x02 << 12)
-#define DMA_THREAD_RESERVE_THREET (0x03 << 12)
-#define DMA_THREAD_FIFO_NONE      (0x00 << 14) /* Def */
-#define DMA_THREAD_FIFO_75        (0x01 << 14)
-#define DMA_THREAD_FIFO_25        (0x02 << 14)
-#define DMA_THREAD_FIFO_50        (0x03 << 14)
+#define DMA_THREAD_RESERVE_NORM                (0x00 << 12) /* Def */
+#define DMA_THREAD_RESERVE_ONET                (0x01 << 12)
+#define DMA_THREAD_RESERVE_TWOT                (0x02 << 12)
+#define DMA_THREAD_RESERVE_THREET      (0x03 << 12)
+#define DMA_THREAD_FIFO_NONE           (0x00 << 14) /* Def */
+#define DMA_THREAD_FIFO_75             (0x01 << 14)
+#define DMA_THREAD_FIFO_25             (0x02 << 14)
+#define DMA_THREAD_FIFO_50             (0x03 << 14)
 
 /* Chaining modes*/
 #ifndef CONFIG_ARCH_OMAP1
@@ -491,9 +491,9 @@ extern int omap_get_dma_src_addr_counter(int lch);
 extern void omap_clear_dma(int lch);
 extern int omap_dma_running(void);
 extern void omap_dma_set_global_params(int arb_rate, int max_fifo_depth,
-                                       int tparams);
+                                      int tparams);
 extern int omap_dma_set_prio_lch(int lch, unsigned char read_prio,
-                               unsigned char write_prio);
+                                unsigned char write_prio);
 extern void omap_set_dma_dst_endian_type(int lch, enum end_type etype);
 extern void omap_set_dma_src_endian_type(int lch, enum end_type etype);
 extern int omap_get_dma_index(int lch, int *ei, int *fi);
@@ -501,14 +501,15 @@ extern int omap_get_dma_index(int lch, int *ei, int *fi);
 /* Chaining APIs */
 #ifndef CONFIG_ARCH_OMAP1
 extern int omap_request_dma_chain(int dev_id, const char *dev_name,
-                               void (*callback) (int chain_id, u16 ch_status,
-                                                       void *data),
-                               int *chain_id, int no_of_chans, int chain_mode,
-                               struct omap_dma_channel_params params);
+                                 void (*callback) (int chain_id, u16 ch_status,
+                                                   void *data),
+                                 int *chain_id, int no_of_chans,
+                                 int chain_mode,
+                                 struct omap_dma_channel_params params);
 extern int omap_free_dma_chain(int chain_id);
 extern int omap_dma_chain_a_transfer(int chain_id, int src_start,
-                                       int dest_start, int elem_count,
-                                       int frame_count, void *callbk_data);
+                                    int dest_start, int elem_count,
+                                    int frame_count, void *callbk_data);
 extern int omap_start_dma_chain_transfers(int chain_id);
 extern int omap_stop_dma_chain_transfers(int chain_id);
 extern int omap_get_dma_chain_index(int chain_id, int *ei, int *fi);