aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r--arch/arm/plat-omap/dma.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index b729623f2967..b4dcd92a5845 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -38,7 +38,6 @@
38 38
39#include <plat/cpu.h> 39#include <plat/cpu.h>
40#include <plat-omap/dma-omap.h> 40#include <plat-omap/dma-omap.h>
41#include <plat/tc.h>
42 41
43/* 42/*
44 * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA 43 * MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
@@ -175,6 +174,7 @@ static inline void set_gdma_dev(int req, int dev)
175#define omap_writel(val, reg) do {} while (0) 174#define omap_writel(val, reg) do {} while (0)
176#endif 175#endif
177 176
177#ifdef CONFIG_ARCH_OMAP1
178void omap_set_dma_priority(int lch, int dst_port, int priority) 178void omap_set_dma_priority(int lch, int dst_port, int priority)
179{ 179{
180 unsigned long reg; 180 unsigned long reg;
@@ -203,18 +203,22 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)
203 l |= (priority & 0xf) << 8; 203 l |= (priority & 0xf) << 8;
204 omap_writel(l, reg); 204 omap_writel(l, reg);
205 } 205 }
206}
207#endif
206 208
207 if (cpu_class_is_omap2()) { 209#ifdef CONFIG_ARCH_OMAP2PLUS
208 u32 ccr; 210void omap_set_dma_priority(int lch, int dst_port, int priority)
211{
212 u32 ccr;
209 213
210 ccr = p->dma_read(CCR, lch); 214 ccr = p->dma_read(CCR, lch);
211 if (priority) 215 if (priority)
212 ccr |= (1 << 6); 216 ccr |= (1 << 6);
213 else 217 else
214 ccr &= ~(1 << 6); 218 ccr &= ~(1 << 6);
215 p->dma_write(ccr, CCR, lch); 219 p->dma_write(ccr, CCR, lch);
216 }
217} 220}
221#endif
218EXPORT_SYMBOL(omap_set_dma_priority); 222EXPORT_SYMBOL(omap_set_dma_priority);
219 223
220void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, 224void omap_set_dma_transfer_params(int lch, int data_type, int elem_count,