diff options
| author | Lokesh Vutla | 2012-10-15 14:03:51 -0700 |
|---|---|---|
| committer | Tony Lindgren | 2012-10-15 14:03:51 -0700 |
| commit | d5e7c864f386306587f7f43ed22d48ef7e4050d6 (patch) | |
| tree | ee0188a3e164efaf325c120565987bc35920b5f8 /drivers | |
| parent | 8c4cc00552664d0be259388f2b1a49036c3757fa (diff) | |
ARM: OMAP2+: DMA: Moving OMAP2+ DMA channel definitions to mach-omap2
Similar to omap1, some of the omap2+ dma channel definitions are
used by some drivers. For moving omap2+ dma channel definitions
to mach-omap2/, the used ones should be defined locally to driver.
Drivers can eliminate it using DT, platform data, or IORESOURCE_DMA
And moving omap2+ DMA channel definitions to mach-omap2
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/omap3isp/isphist.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/omap.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 2 | ||||
| -rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 7 |
4 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c index d1a8dee5e1ca..e7f9c4292cc6 100644 --- a/drivers/media/platform/omap3isp/isphist.c +++ b/drivers/media/platform/omap3isp/isphist.c @@ -34,6 +34,8 @@ #include "ispreg.h" #include "isphist.h" +#define OMAP24XX_DMA_NO_DEVICE 0 + #define HIST_CONFIG_DMA 1 #define HIST_USING_DMA(hist) ((hist)->dma_ch >= 0) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index b2cf37b0ee30..9664fa964760 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -89,6 +89,12 @@ #define OMAP_DMA_MMC2_TX 54 #define OMAP_DMA_MMC2_RX 55 +#define OMAP24XX_DMA_MMC2_TX 47 +#define OMAP24XX_DMA_MMC2_RX 48 +#define OMAP24XX_DMA_MMC1_TX 61 +#define OMAP24XX_DMA_MMC1_RX 62 + + #define DRIVER_NAME "mmci-omap" /* Specifies how often in millisecs to poll for card status changes diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 5b3138620646..3105f22993cd 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -111,6 +111,8 @@ #define ECCCLEAR 0x100 #define ECC1 0x1 +#define OMAP24XX_DMA_GPMC 4 + /* oob info generated runtime depending on ecc algorithm and layout selected */ static struct nand_ecclayout omap_oobinfo; /* Define some generic bad / good block scan pattern which are used diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 7a62b95dac24..c032fc2132d0 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -25,6 +25,13 @@ #define MAX_DMAREQ 5 /* REVISIT: Really 6, but req5 not OK */ +#define OMAP24XX_DMA_EXT_DMAREQ0 2 +#define OMAP24XX_DMA_EXT_DMAREQ1 3 +#define OMAP242X_DMA_EXT_DMAREQ2 14 +#define OMAP242X_DMA_EXT_DMAREQ3 15 +#define OMAP242X_DMA_EXT_DMAREQ4 16 +#define OMAP242X_DMA_EXT_DMAREQ5 64 + struct tusb_omap_dma_ch { struct musb *musb; void __iomem *tbase; |