diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-15 23:01:01 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 23:01:01 +0200 |
| commit | 8c4cc00552664d0be259388f2b1a49036c3757fa (patch) | |
| tree | 1ca58cbac27878bd28cb6a2d04c5c52d29d2dd94 /drivers/media | |
| parent | ARM: OMAP: DMA: Removing plat/dma-44xx.h (diff) | |
| download | linux-8c4cc00552664d0be259388f2b1a49036c3757fa.tar.xz linux-8c4cc00552664d0be259388f2b1a49036c3757fa.zip | |
ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1
Some of the omap1 dma channel definitions are used by some drivers.
For moving omap1 dma channel definitions to mach-omap1/, the used
ones should be defined locally to driver. Driver can eliminate it
by using DT, platform data, or IORESOURCE_DMA.
And moving OMAP1 DMA channel definitions to mach-omap1
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 4be26abf6cea..11d7a29b9708 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c @@ -22,6 +22,8 @@ #include "omap_voutdef.h" #include "omap_voutlib.h" +#define OMAP_DMA_NO_DEVICE 0 + /* * Function for allocating video buffers */ diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index fa08c7695ccb..3046dba91006 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c @@ -40,6 +40,7 @@ #define DRIVER_NAME "omap1-camera" #define DRIVER_VERSION "0.0.2" +#define OMAP_DMA_CAMERA_IF_RX 20 /* * --------------------------------------------------------------------------- |