diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 11 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/dma.h | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index f7f571e7987e..ec7eddf9e525 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -290,7 +290,7 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, | |||
290 | val = dma_read(CCR(lch)); | 290 | val = dma_read(CCR(lch)); |
291 | 291 | ||
292 | /* DMA_SYNCHRO_CONTROL_UPPER depends on the channel number */ | 292 | /* DMA_SYNCHRO_CONTROL_UPPER depends on the channel number */ |
293 | val &= ~((3 << 19) | 0x1f); | 293 | val &= ~((1 << 23) | (3 << 19) | 0x1f); |
294 | val |= (dma_trigger & ~0x1f) << 14; | 294 | val |= (dma_trigger & ~0x1f) << 14; |
295 | val |= dma_trigger & 0x1f; | 295 | val |= dma_trigger & 0x1f; |
296 | 296 | ||
@@ -304,11 +304,14 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, | |||
304 | else | 304 | else |
305 | val &= ~(1 << 18); | 305 | val &= ~(1 << 18); |
306 | 306 | ||
307 | if (src_or_dst_synch) | 307 | if (src_or_dst_synch == OMAP_DMA_DST_SYNC_PREFETCH) { |
308 | val &= ~(1 << 24); /* dest synch */ | ||
309 | val |= (1 << 23); /* Prefetch */ | ||
310 | } else if (src_or_dst_synch) { | ||
308 | val |= 1 << 24; /* source synch */ | 311 | val |= 1 << 24; /* source synch */ |
309 | else | 312 | } else { |
310 | val &= ~(1 << 24); /* dest synch */ | 313 | val &= ~(1 << 24); /* dest synch */ |
311 | 314 | } | |
312 | dma_write(val, CCR(lch)); | 315 | dma_write(val, CCR(lch)); |
313 | } | 316 | } |
314 | 317 | ||
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index 02232ca2c37f..af3a03941add 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h | |||
@@ -345,6 +345,7 @@ | |||
345 | #define OMAP_DMA_SYNC_BLOCK 0x02 | 345 | #define OMAP_DMA_SYNC_BLOCK 0x02 |
346 | #define OMAP_DMA_SYNC_PACKET 0x03 | 346 | #define OMAP_DMA_SYNC_PACKET 0x03 |
347 | 347 | ||
348 | #define OMAP_DMA_DST_SYNC_PREFETCH 0x02 | ||
348 | #define OMAP_DMA_SRC_SYNC 0x01 | 349 | #define OMAP_DMA_SRC_SYNC 0x01 |
349 | #define OMAP_DMA_DST_SYNC 0x00 | 350 | #define OMAP_DMA_DST_SYNC 0x00 |
350 | 351 | ||