summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:06:24 +0100
commit9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch)
treed8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/dma
parent49ea7fc094162fcaa83f5876b2090c816cc4498c (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/omap-dma.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index bb2d8e7029e..7d35c237fbf 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -19,8 +19,7 @@
#include "virt-dma.h"
-#include <plat/cpu.h>
-#include <plat/dma.h>
+#include <plat-omap/dma-omap.h>
struct omap_dmadev {
struct dma_device ddev;
@@ -438,7 +437,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic(
omap_disable_dma_irq(c->dma_ch, OMAP_DMA_BLOCK_IRQ);
}
- if (!cpu_class_is_omap1()) {
+ if (dma_omap2plus()) {
omap_set_dma_src_burst_mode(c->dma_ch, OMAP_DMA_DATA_BURST_16);
omap_set_dma_dest_burst_mode(c->dma_ch, OMAP_DMA_DATA_BURST_16);
}