diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-15 14:01:01 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 14:01:01 -0700 |
| commit | 8c4cc00552664d0be259388f2b1a49036c3757fa (patch) | |
| tree | 1ca58cbac27878bd28cb6a2d04c5c52d29d2dd94 /drivers | |
| parent | cc8c29d9ff05cc15681f9715eea6c292877f7b41 (diff) | |
| download | linux-8c4cc00552664d0be259388f2b1a49036c3757fa.tar.bz2 | |
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')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/omap.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 |
4 files changed, 9 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 /* * --------------------------------------------------------------------------- diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 48ad361613ef..b2cf37b0ee30 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -84,6 +84,10 @@ #define OMAP_MMC_CMDTYPE_AC 2 #define OMAP_MMC_CMDTYPE_ADTC 3 +#define OMAP_DMA_MMC_TX 21 +#define OMAP_DMA_MMC_RX 22 +#define OMAP_DMA_MMC2_TX 54 +#define OMAP_DMA_MMC2_RX 55 #define DRIVER_NAME "mmci-omap" diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 2a4749c3eb3f..024c0b9150bb 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -61,6 +61,8 @@ #define DRIVER_DESC "OMAP UDC driver" #define DRIVER_VERSION "4 October 2004" +#define OMAP_DMA_USB_W2FC_TX0 29 + /* * The OMAP UDC needs _very_ early endpoint setup: before enabling the * D+ pullup to allow enumeration. That's too early for the gadget |