UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Arnd Bergmann 2014-04-15 17:36:43 +02:00
parent 0f67b87609
commit 74911e3a0e
5 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-mmp/include/mach/dma.h
View File

@ -1,13 +0,0 @@
/*
* linux/arch/arm/mach-mmp/include/mach/dma.h
*/
#ifndef __ASM_MACH_DMA_H
#define __ASM_MACH_DMA_H
#include <mach/addr-map.h>
#define DMAC_REGS_VIRT (APB_VIRT_BASE + 0x00000)
#include <plat/dma.h>
#endif /* __ASM_MACH_DMA_H */

2
arch/arm/mach-mmp/mmp2.c
View File

@ -25,7 +25,6 @@
#include <mach/regs-apbc.h> #include <mach/regs-apbc.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h>
#include <mach/mfp.h> #include <mach/mfp.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/mmp2.h> #include <mach/mmp2.h>
@ -111,7 +110,6 @@ static int __init mmp2_init(void)
#endif #endif
mfp_init_base(MFPR_VIRT_BASE); mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(mmp2_addr_map); mfp_init_addr(mmp2_addr_map);
pxa_init_dma(IRQ_MMP2_DMA_RIQ, 16);
mmp2_clk_init(APB_PHYS_BASE + 0x50000, mmp2_clk_init(APB_PHYS_BASE + 0x50000,
AXI_PHYS_BASE + 0x82800, AXI_PHYS_BASE + 0x82800,
APB_PHYS_BASE + 0x15000); APB_PHYS_BASE + 0x15000);

2
arch/arm/mach-mmp/pxa168.c
View File

@ -24,7 +24,6 @@
#include <mach/regs-apbc.h> #include <mach/regs-apbc.h>
#include <mach/regs-apmu.h> #include <mach/regs-apmu.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/mfp.h> #include <mach/mfp.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@ -56,7 +55,6 @@ static int __init pxa168_init(void)
if (cpu_is_pxa168()) { if (cpu_is_pxa168()) {
mfp_init_base(MFPR_VIRT_BASE); mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(pxa168_mfp_addr_map); mfp_init_addr(pxa168_mfp_addr_map);
pxa_init_dma(IRQ_PXA168_DMA_INT0, 32);
pxa168_clk_init(APB_PHYS_BASE + 0x50000, pxa168_clk_init(APB_PHYS_BASE + 0x50000,
AXI_PHYS_BASE + 0x82800, AXI_PHYS_BASE + 0x82800,
APB_PHYS_BASE + 0x15000); APB_PHYS_BASE + 0x15000);

2
arch/arm/mach-mmp/pxa910.c
View File

@ -23,7 +23,6 @@
#include <mach/regs-apbc.h> #include <mach/regs-apbc.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h>
#include <mach/mfp.h> #include <mach/mfp.h>
#include <mach/devices.h> #include <mach/devices.h>
#include <mach/pm-pxa910.h> #include <mach/pm-pxa910.h>
@ -97,7 +96,6 @@ static int __init pxa910_init(void)
#endif #endif
mfp_init_base(MFPR_VIRT_BASE); mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(pxa910_mfp_addr_map); mfp_init_addr(pxa910_mfp_addr_map);
pxa_init_dma(IRQ_PXA910_DMA_INT0, 32);
pxa910_clk_init(APB_PHYS_BASE + 0x50000, pxa910_clk_init(APB_PHYS_BASE + 0x50000,
AXI_PHYS_BASE + 0x82800, AXI_PHYS_BASE + 0x82800,
APB_PHYS_BASE + 0x15000, APB_PHYS_BASE + 0x15000,

2
arch/arm/plat-pxa/Makefile
View File

@ -2,7 +2,7 @@
# Makefile for code common across different PXA processor families # Makefile for code common across different PXA processor families
# #
obj-y := dma.o obj-$(CONFIG_ARCH_PXA) := dma.o
obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_PXA3xx) += mfp.o
obj-$(CONFIG_ARCH_MMP) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o