diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-04-15 11:36:43 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-01 15:44:27 -0500 |
commit | 74911e3a0eca6b3e03bc0764af9486b783b44ebf (patch) | |
tree | e14d86d65b29e46da8ce79b57b642fb306268002 /arch/arm/mach-mmp | |
parent | 0f67b876092ae4fabe6ff81a92c785a69edb0022 (diff) |
ARM: mmp: remove remaining legacy pxa-dma support
All drivers have stopped using this code, so we can just
as well stop initializing it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/dma.h | 13 | ||||
-rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/pxa168.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mmp/pxa910.c | 2 |
4 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-mmp/include/mach/dma.h b/arch/arm/mach-mmp/include/mach/dma.h deleted file mode 100644 index 1d6914544da4..000000000000 --- a/arch/arm/mach-mmp/include/mach/dma.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-mmp/include/mach/dma.h | ||
3 | */ | ||
4 | |||
5 | #ifndef __ASM_MACH_DMA_H | ||
6 | #define __ASM_MACH_DMA_H | ||
7 | |||
8 | #include <mach/addr-map.h> | ||
9 | |||
10 | #define DMAC_REGS_VIRT (APB_VIRT_BASE + 0x00000) | ||
11 | |||
12 | #include <plat/dma.h> | ||
13 | #endif /* __ASM_MACH_DMA_H */ | ||
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index c8914ef21f7f..82eb53f5136a 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <mach/regs-apbc.h> | 25 | #include <mach/regs-apbc.h> |
26 | #include <mach/cputype.h> | 26 | #include <mach/cputype.h> |
27 | #include <mach/irqs.h> | 27 | #include <mach/irqs.h> |
28 | #include <mach/dma.h> | ||
29 | #include <mach/mfp.h> | 28 | #include <mach/mfp.h> |
30 | #include <mach/devices.h> | 29 | #include <mach/devices.h> |
31 | #include <mach/mmp2.h> | 30 | #include <mach/mmp2.h> |
@@ -111,7 +110,6 @@ static int __init mmp2_init(void) | |||
111 | #endif | 110 | #endif |
112 | mfp_init_base(MFPR_VIRT_BASE); | 111 | mfp_init_base(MFPR_VIRT_BASE); |
113 | mfp_init_addr(mmp2_addr_map); | 112 | mfp_init_addr(mmp2_addr_map); |
114 | pxa_init_dma(IRQ_MMP2_DMA_RIQ, 16); | ||
115 | mmp2_clk_init(APB_PHYS_BASE + 0x50000, | 113 | mmp2_clk_init(APB_PHYS_BASE + 0x50000, |
116 | AXI_PHYS_BASE + 0x82800, | 114 | AXI_PHYS_BASE + 0x82800, |
117 | APB_PHYS_BASE + 0x15000); | 115 | APB_PHYS_BASE + 0x15000); |
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 53f21554ae63..7367f4b079e4 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <mach/regs-apbc.h> | 24 | #include <mach/regs-apbc.h> |
25 | #include <mach/regs-apmu.h> | 25 | #include <mach/regs-apmu.h> |
26 | #include <mach/irqs.h> | 26 | #include <mach/irqs.h> |
27 | #include <mach/dma.h> | ||
28 | #include <mach/devices.h> | 27 | #include <mach/devices.h> |
29 | #include <mach/mfp.h> | 28 | #include <mach/mfp.h> |
30 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
@@ -56,7 +55,6 @@ static int __init pxa168_init(void) | |||
56 | if (cpu_is_pxa168()) { | 55 | if (cpu_is_pxa168()) { |
57 | mfp_init_base(MFPR_VIRT_BASE); | 56 | mfp_init_base(MFPR_VIRT_BASE); |
58 | mfp_init_addr(pxa168_mfp_addr_map); | 57 | mfp_init_addr(pxa168_mfp_addr_map); |
59 | pxa_init_dma(IRQ_PXA168_DMA_INT0, 32); | ||
60 | pxa168_clk_init(APB_PHYS_BASE + 0x50000, | 58 | pxa168_clk_init(APB_PHYS_BASE + 0x50000, |
61 | AXI_PHYS_BASE + 0x82800, | 59 | AXI_PHYS_BASE + 0x82800, |
62 | APB_PHYS_BASE + 0x15000); | 60 | APB_PHYS_BASE + 0x15000); |
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 545404261327..15f7be01fed8 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <mach/regs-apbc.h> | 23 | #include <mach/regs-apbc.h> |
24 | #include <mach/cputype.h> | 24 | #include <mach/cputype.h> |
25 | #include <mach/irqs.h> | 25 | #include <mach/irqs.h> |
26 | #include <mach/dma.h> | ||
27 | #include <mach/mfp.h> | 26 | #include <mach/mfp.h> |
28 | #include <mach/devices.h> | 27 | #include <mach/devices.h> |
29 | #include <mach/pm-pxa910.h> | 28 | #include <mach/pm-pxa910.h> |
@@ -97,7 +96,6 @@ static int __init pxa910_init(void) | |||
97 | #endif | 96 | #endif |
98 | mfp_init_base(MFPR_VIRT_BASE); | 97 | mfp_init_base(MFPR_VIRT_BASE); |
99 | mfp_init_addr(pxa910_mfp_addr_map); | 98 | mfp_init_addr(pxa910_mfp_addr_map); |
100 | pxa_init_dma(IRQ_PXA910_DMA_INT0, 32); | ||
101 | pxa910_clk_init(APB_PHYS_BASE + 0x50000, | 99 | pxa910_clk_init(APB_PHYS_BASE + 0x50000, |
102 | AXI_PHYS_BASE + 0x82800, | 100 | AXI_PHYS_BASE + 0x82800, |
103 | APB_PHYS_BASE + 0x15000, | 101 | APB_PHYS_BASE + 0x15000, |