diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-02 22:39:28 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:36:40 +0200 |
| commit | 54b693d46772f59fcfcb2cdd0f8b4bff2392b188 (patch) | |
| tree | 3a34f886fc530ed98bb37648d274f3170625d32f /arch/arm/plat-omap/dma.c | |
| parent | ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap (diff) | |
| download | linux-54b693d46772f59fcfcb2cdd0f8b4bff2392b188.tar.xz linux-54b693d46772f59fcfcb2cdd0f8b4bff2392b188.zip | |
ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1
We cannot keep this in plat as it causes problems
with the ARM single zImage support.
Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 24 |
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 @@ #include <plat/cpu.h> #include <plat-omap/dma-omap.h> -#include <plat/tc.h> /* * 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) #define omap_writel(val, reg) do {} while (0) #endif +#ifdef CONFIG_ARCH_OMAP1 void omap_set_dma_priority(int lch, int dst_port, int priority) { unsigned long reg; @@ -203,18 +203,22 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) l |= (priority & 0xf) << 8; omap_writel(l, reg); } +} +#endif - if (cpu_class_is_omap2()) { - u32 ccr; +#ifdef CONFIG_ARCH_OMAP2PLUS +void omap_set_dma_priority(int lch, int dst_port, int priority) +{ + u32 ccr; - ccr = p->dma_read(CCR, lch); - if (priority) - ccr |= (1 << 6); - else - ccr &= ~(1 << 6); - p->dma_write(ccr, CCR, lch); - } + ccr = p->dma_read(CCR, lch); + if (priority) + ccr |= (1 << 6); + else + ccr &= ~(1 << 6); + p->dma_write(ccr, CCR, lch); } +#endif EXPORT_SYMBOL(omap_set_dma_priority); void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, |