diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2012-10-15 17:04:53 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 17:04:53 -0400 |
| commit | 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8 (patch) | |
| tree | 56f5717067157dec194e547afd986e15cf7163ef /drivers | |
| parent | d5e7c864f386306587f7f43ed22d48ef7e4050d6 (diff) | |
ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h
Move plat/dma.h to plat-omap/dma-omap.h as part of single
zImage work
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/omap-aes.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/omap-sham.c | 2 | ||||
| -rw-r--r-- | drivers/dma/omap-dma.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispstat.h | 2 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/omap.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap/lcdc.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap/sossi.c | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index 093a8af59cb..3e61febb8bb 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <crypto/aes.h> | 30 | #include <crypto/aes.h> |
| 31 | 31 | ||
| 32 | #include <plat/cpu.h> | 32 | #include <plat/cpu.h> |
| 33 | #include <plat/dma.h> | 33 | #include <plat-omap/dma-omap.h> |
| 34 | 34 | ||
| 35 | /* OMAP TRM gives bitfields as start:end, where start is the higher bit | 35 | /* OMAP TRM gives bitfields as start:end, where start is the higher bit |
| 36 | number. For example 7:0 */ | 36 | number. For example 7:0 */ |
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index a3fd6fc504b..6d796957714 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <crypto/internal/hash.h> | 38 | #include <crypto/internal/hash.h> |
| 39 | 39 | ||
| 40 | #include <plat/cpu.h> | 40 | #include <plat/cpu.h> |
| 41 | #include <plat/dma.h> | 41 | #include <plat-omap/dma-omap.h> |
| 42 | #include <mach/irqs.h> | 42 | #include <mach/irqs.h> |
| 43 | 43 | ||
| 44 | #define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04)) | 44 | #define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04)) |
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index bb2d8e7029e..0b4fa50537e 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include "virt-dma.h" | 20 | #include "virt-dma.h" |
| 21 | 21 | ||
| 22 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
| 23 | #include <plat/dma.h> | 23 | #include <plat-omap/dma-omap.h> |
| 24 | 24 | ||
| 25 | struct omap_dmadev { | 25 | struct omap_dmadev { |
| 26 | struct dma_device ddev; | 26 | struct dma_device ddev; |
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index a3b1a34c896..1bd6a2ec95a 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #include <media/v4l2-ioctl.h> | 45 | #include <media/v4l2-ioctl.h> |
| 46 | 46 | ||
| 47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
| 48 | #include <plat/dma.h> | 48 | #include <plat-omap/dma-omap.h> |
| 49 | #include <plat/vrfb.h> | 49 | #include <plat/vrfb.h> |
| 50 | #include <video/omapdss.h> | 50 | #include <video/omapdss.h> |
| 51 | 51 | ||
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index 11d7a29b970..bed4cbb18ef 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <media/videobuf-dma-contig.h> | 16 | #include <media/videobuf-dma-contig.h> |
| 17 | #include <media/v4l2-device.h> | 17 | #include <media/v4l2-device.h> |
| 18 | 18 | ||
| 19 | #include <plat/dma.h> | 19 | #include <plat-omap/dma-omap.h> |
| 20 | #include <plat/vrfb.h> | 20 | #include <plat/vrfb.h> |
| 21 | 21 | ||
| 22 | #include "omap_voutdef.h" | 22 | #include "omap_voutdef.h" |
diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h index a6fe653eb23..40f87cdd799 100644 --- a/drivers/media/platform/omap3isp/ispstat.h +++ b/drivers/media/platform/omap3isp/ispstat.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/omap3isp.h> | 32 | #include <linux/omap3isp.h> |
| 33 | #include <plat/dma.h> | 33 | #include <plat-omap/dma-omap.h> |
| 34 | #include <media/v4l2-event.h> | 34 | #include <media/v4l2-event.h> |
| 35 | 35 | ||
| 36 | #include "isp.h" | 36 | #include "isp.h" |
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index 3046dba9100..cae9ce6275e 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <media/videobuf-dma-contig.h> | 34 | #include <media/videobuf-dma-contig.h> |
| 35 | #include <media/videobuf-dma-sg.h> | 35 | #include <media/videobuf-dma-sg.h> |
| 36 | 36 | ||
| 37 | #include <plat/dma.h> | 37 | #include <plat-omap/dma-omap.h> |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | #define DRIVER_NAME "omap1-camera" | 40 | #define DRIVER_NAME "omap1-camera" |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 9664fa96476..c59c4d25165 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 31 | 31 | ||
| 32 | #include <plat/mmc.h> | 32 | #include <plat/mmc.h> |
| 33 | #include <plat/dma.h> | 33 | #include <plat-omap/dma-omap.h> |
| 34 | 34 | ||
| 35 | #define OMAP_MMC_REG_CMD 0x00 | 35 | #define OMAP_MMC_REG_CMD 0x00 |
| 36 | #define OMAP_MMC_REG_ARGL 0x01 | 36 | #define OMAP_MMC_REG_ARGL 0x01 |
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 3105f22993c..2cbdb8e17c7 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #include <linux/bch.h> | 27 | #include <linux/bch.h> |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #include <plat/dma.h> | 30 | #include <plat-omap/dma-omap.h> |
| 31 | #include <plat/gpmc.h> | 31 | #include <plat/gpmc.h> |
| 32 | #include <linux/platform_data/mtd-nand-omap2.h> | 32 | #include <linux/platform_data/mtd-nand-omap2.h> |
| 33 | 33 | ||
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 1961be98517..b846eafa2f0 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <linux/platform_data/mtd-onenand-omap2.h> | 42 | #include <linux/platform_data/mtd-onenand-omap2.h> |
| 43 | #include <asm/gpio.h> | 43 | #include <asm/gpio.h> |
| 44 | 44 | ||
| 45 | #include <plat/dma.h> | 45 | #include <plat-omap/dma-omap.h> |
| 46 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
| 47 | 47 | ||
| 48 | #define DRIVER_NAME "omap2-onenand" | 48 | #define DRIVER_NAME "omap2-onenand" |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 024c0b9150b..23afa06b65a 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <asm/unaligned.h> | 44 | #include <asm/unaligned.h> |
| 45 | #include <asm/mach-types.h> | 45 | #include <asm/mach-types.h> |
| 46 | 46 | ||
| 47 | #include <plat/dma.h> | 47 | #include <plat-omap/dma-omap.h> |
| 48 | 48 | ||
| 49 | #include <mach/usb.h> | 49 | #include <mach/usb.h> |
| 50 | 50 | ||
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index c032fc2132d..bfca114f7c5 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <plat/dma.h> | 19 | #include <plat-omap/dma-omap.h> |
| 20 | 20 | ||
| 21 | #include "musb_core.h" | 21 | #include "musb_core.h" |
| 22 | #include "tusb6010.h" | 22 | #include "tusb6010.h" |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 7767338f8b1..c39d6e46f8c 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/gfp.h> | 31 | #include <linux/gfp.h> |
| 32 | 32 | ||
| 33 | #include <mach/lcdc.h> | 33 | #include <mach/lcdc.h> |
| 34 | #include <plat/dma.h> | 34 | #include <plat-omap/dma-omap.h> |
| 35 | 35 | ||
| 36 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 37 | 37 | ||
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 4351c438b76..1b5ee8ec192 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | 32 | ||
| 33 | #include <plat/dma.h> | 33 | #include <plat-omap/dma-omap.h> |
| 34 | 34 | ||
| 35 | #include "omapfb.h" | 35 | #include "omapfb.h" |
| 36 | #include "lcdc.h" | 36 | #include "lcdc.h" |
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index f79c137753d..c510a445739 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
| @@ -25,7 +25,7 @@ | |||
