diff options
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
-rw-r--r-- | arch/arm/mach-omap2/dma.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index ff75abe60af2..e5aba58da5d2 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c | |||
@@ -28,9 +28,11 @@ | |||
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/device.h> | 29 | #include <linux/device.h> |
30 | 30 | ||
31 | #include <plat/omap_hwmod.h> | 31 | #include <plat-omap/dma-omap.h> |
32 | #include <plat/omap_device.h> | 32 | |
33 | #include <plat/dma.h> | 33 | #include "soc.h" |
34 | #include "omap_hwmod.h" | ||
35 | #include "omap_device.h" | ||
34 | 36 | ||
35 | #define OMAP2_DMA_STRIDE 0x60 | 37 | #define OMAP2_DMA_STRIDE 0x60 |
36 | 38 | ||
@@ -274,6 +276,9 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) | |||
274 | return -ENOMEM; | 276 | return -ENOMEM; |
275 | } | 277 | } |
276 | 278 | ||
279 | if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP)) | ||
280 | d->dev_caps |= HS_CHANNELS_RESERVED; | ||
281 | |||
277 | /* Check the capabilities register for descriptor loading feature */ | 282 | /* Check the capabilities register for descriptor loading feature */ |
278 | if (dma_read(CAPS_0, 0) & DMA_HAS_DESCRIPTOR_CAPS) | 283 | if (dma_read(CAPS_0, 0) & DMA_HAS_DESCRIPTOR_CAPS) |
279 | dma_common_ch_end = CCDN; | 284 | dma_common_ch_end = CCDN; |