diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-01-02 06:38:42 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:22:36 -0400 |
commit | 7ebc8d56f407184a457dd5fc739cf39e423a25aa (patch) | |
tree | 6c5e7ba83c22def2304bf6db69116ca5d763c0b8 /drivers | |
parent | fef1f99a0c2928893c074bf3eff27efd36a4532a (diff) |
[ARM] pxa: move DMA registers definitions into <mach/dma.h>
1. Driver code where pxa_request_dma() is called will most likely
reference DMA registers as well, and it is really unnecessary
to include pxa-regs.h just for this. Move the definitions into
<mach/dma.h> and make relevant drivers include it instead of
<mach/pxa-regs.h>.
2. Introduce DMAC_REGS_VIRT as the virtual address base for these
DMA registers. This allows later processors to re-use the same
IP while registers may start at different I/O address.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 1 | ||||
-rw-r--r-- | drivers/mmc/host/pxamci.c | 3 | ||||
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 1 | ||||
-rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index a1d6008efcbb..e3e6b29ea6d2 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
36 | 36 | ||
37 | #include <mach/dma.h> | 37 | #include <mach/dma.h> |
38 | #include <mach/pxa-regs.h> | ||
39 | #include <mach/camera.h> | 38 | #include <mach/camera.h> |
40 | 39 | ||
41 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 40 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 9702ad3774cf..430095725f9f 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -30,9 +30,8 @@ | |||
30 | 30 | ||
31 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |
32 | 32 | ||
33 | #include <mach/dma.h> | ||
34 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
35 | #include <mach/pxa-regs.h> | 34 | #include <mach/dma.h> |
36 | #include <mach/mmc.h> | 35 | #include <mach/mmc.h> |
37 | 36 | ||
38 | #include "pxamci.h" | 37 | #include "pxamci.h" |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index cc55cbc2b308..61b69cc40009 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
23 | 23 | ||
24 | #include <mach/dma.h> | 24 | #include <mach/dma.h> |
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/pxa3xx_nand.h> | 25 | #include <mach/pxa3xx_nand.h> |
27 | 26 | ||
28 | #define CHIP_DELAY_TIMEOUT (2 * HZ/10) | 27 | #define CHIP_DELAY_TIMEOUT (2 * HZ/10) |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index d0fc4ca2f656..d22fac27219a 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -34,8 +34,6 @@ | |||
34 | #include <asm/delay.h> | 34 | #include <asm/delay.h> |
35 | 35 | ||
36 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |
37 | #include <mach/hardware.h> | ||
38 | #include <mach/pxa-regs.h> | ||
39 | #include <mach/regs-ssp.h> | 37 | #include <mach/regs-ssp.h> |
40 | #include <mach/ssp.h> | 38 | #include <mach/ssp.h> |
41 | #include <mach/pxa2xx_spi.h> | 39 | #include <mach/pxa2xx_spi.h> |