Commit e7536617 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: footbridge: move isa-dma support into footbridge 



The dma-isa.c was shared between footbridge and shark a long time ago,
but as shark was removed, it can be made footbridge specific again.

The fb_dma bits in turn are not used at all and can be removed.

All the ISA related files are now built into the platform regardless
of CONFIG_ISA, as they just refer to on-chip devices rather than actual
ISA cards.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b6dd8284

arch/arm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -989,11 +989,6 @@ config ISA 
	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;

	  newer boards don't support it.  If you have ISA, say Y, otherwise N.



# Select ISA DMA controller support

config ISA_DMA

	bool

	select ISA_DMA_API



# Select ISA DMA interface

config ISA_DMA_API

	bool

arch/arm/include/asm/mach/dma.h

+0 −5
Original line number Diff line number Diff line
@@ -44,8 +44,3 @@ struct dma_struct { 
 * isa_dma_add - add an ISA-style DMA channel

 */

extern int isa_dma_add(unsigned int, dma_t *dma);
 


/*

 * Add the ISA DMA controller.  Always takes channels 0-7.

 */

extern void isa_init_dma(void);

arch/arm/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ obj-$(CONFIG_ISA_DMA_API) += dma.o 
obj-$(CONFIG_FIQ)		+= fiq.o fiqasm.o

obj-$(CONFIG_MODULES)		+= armksyms.o module.o

obj-$(CONFIG_ARM_MODULE_PLTS)	+= module-plts.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_ARM_CPU_SUSPEND)	+= sleep.o suspend.o

obj-$(CONFIG_HIBERNATION)	+= hibernate.o

arch/arm/mach-footbridge/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ config FOOTBRIDGE 
	def_bool y

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ISA_DMA

	select ISA_DMA_API



config ARCH_EBSA285

	bool

arch/arm/mach-footbridge/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


# Object file lists.



obj-y			:= common.o dma.o isa-irq.o

obj-y			:= common.o isa-irq.o isa.o isa-rtc.o dma-isa.o



pci-y			+= dc21285.o

pci-$(CONFIG_ARCH_CATS) += cats-pci.o
@@ -18,4 +18,3 @@ obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o 


obj-$(CONFIG_PCI)	+=$(pci-y)

obj-$(CONFIG_ISA)	+= isa.o isa-rtc.o