Commit 0d9787fa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'footbridge/cleanup' of... 

Merge branch 'footbridge/cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/soc

A cleanup for the footbridge platform that came out of inspecting
the platforms during the multiplatform conversion as well as the
dma address patches.

* 'footbridge/cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: footbridge: remove custom DMA address handling
  ARM: footbridge: move isa-dma support into footbridge
  ARM: footbridge: remove leftover from personal-server
  ARM: footbridge: remove addin mode
parents 8a666046 be7f3f90

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/dma-direct.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <mach/dma-direct.h>

arch/arm/include/asm/dma.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg); 
 */

extern void __set_dma_addr(unsigned int chan, void *addr);

#define set_dma_addr(chan, addr)				\

	__set_dma_addr(chan, (void *)__bus_to_virt(addr))

	__set_dma_addr(chan, (void *)isa_bus_to_virt(addr))



/* Set the DMA byte count for this channel

 *

arch/arm/include/asm/hardware/dec21285.h

+7 −13
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ 
#define DC21285_IO(x)		(x)

#endif



/*

 * The footbridge is programmed to expose the system RAM at 0xe0000000.

 * The requirement is that the RAM isn't placed at bus address 0, which

 * would clash with VGA cards.

 */

#define BUS_OFFSET 0xe0000000



#define CSR_PCICMD		DC21285_IO(0x0004)

#define CSR_CLASSREV		DC21285_IO(0x0008)

#define CSR_PCICACHELINESIZE	DC21285_IO(0x000c)
@@ -81,19 +88,6 @@ 
#define SA110_CNTL_XCSDIR(x)		((x)<<28)

#define SA110_CNTL_PCICFN		(1 << 31)



/*

 * footbridge_cfn_mode() is used when we want

 * to check whether we are the central function

 */

#define __footbridge_cfn_mode() (*CSR_SA110_CNTL & SA110_CNTL_PCICFN)

#if defined(CONFIG_FOOTBRIDGE_HOST) && defined(CONFIG_FOOTBRIDGE_ADDIN)

#define footbridge_cfn_mode() __footbridge_cfn_mode()

#elif defined(CONFIG_FOOTBRIDGE_HOST)

#define footbridge_cfn_mode() (1)

#else

#define footbridge_cfn_mode() (0)

#endif



#define CSR_PCIADDR_EXTN	DC21285_IO(0x0140)

#define CSR_PREFETCHMEMRANGE	DC21285_IO(0x0144)

#define CSR_XBUS_CYCLE		DC21285_IO(0x0148)

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);